From 1f2719fd17c5e9d8854b7107e167bd42fc72223a Mon Sep 17 00:00:00 2001 From: Lynix Date: Wed, 31 Aug 2016 19:16:03 +0200 Subject: [PATCH] Revert "Core/HardwareInfo: Fix indentation (Windows)" This reverts commit a4019076ff9afd3cb7e2d98a54c9788fd2df1457 [formerly 3a39cd2e8a3aa8bb46f9f1465923f2abb8fc19a1] [formerly a23f6beee25e408579609874672806b124bf5fc0 [formerly be4cec088d5683bc18e54fd5daa2805134a88bb9]] [formerly dd94bfecaf16a96cdc39de9abd3c0749f17bf824 [formerly 539605da0eb694cbad2fb52fdb49b9a79c3a0d04] [formerly 00917e0bb4766a6f19f303040241c81a92778185 [formerly 48c4b5219e3d1f74f04099f164712c2baddf1d4b]]]. Former-commit-id: 153fd6ac243aee3971fda0a4a2ec9bed51a4ecbf [formerly 83b196ee86d8689cd331b8ac1e9256fc4158f4bb] [formerly 76dceaeb34c1e3156537ebaa3ba0a73950b03805 [formerly 10f813a3f75ef706c37c3e312ccc58a556b5e1f5]] Former-commit-id: 9e2e56623d1f2b95f013ee0f565a5ffdf0f450b9 [formerly 1e58bd22e6b1070954227f669d92794ce56581a6] Former-commit-id: c5ccf208507c40c8939ce9a92c8f4def6e231b79 --- src/Nazara/Core/Win32/HardwareInfoImpl.cpp | 30 +++++++++---------- .../Shaders/LightScatteringFinal.frag | 18 ----------- .../Shaders/LightScatteringFinal.frag.h | 1 - src/Nazara/Graphics/Sprite.cpp | 10 +++---- 4 files changed, 19 insertions(+), 40 deletions(-) delete mode 100644 src/Nazara/Graphics/Resources/DeferredShading/Shaders/LightScatteringFinal.frag delete mode 100644 src/Nazara/Graphics/Resources/DeferredShading/Shaders/LightScatteringFinal.frag.h diff --git a/src/Nazara/Core/Win32/HardwareInfoImpl.cpp b/src/Nazara/Core/Win32/HardwareInfoImpl.cpp index 62b86bf91..7ce5e10a1 100644 --- a/src/Nazara/Core/Win32/HardwareInfoImpl.cpp +++ b/src/Nazara/Core/Win32/HardwareInfoImpl.cpp @@ -76,25 +76,25 @@ namespace Nz #elif defined(NAZARA_COMPILER_CLANG) || defined(NAZARA_COMPILER_GCC) || defined(NAZARA_COMPILER_INTEL) int supported; asm volatile (" pushfl\n" - " pop %%eax\n" - " mov %%eax, %%ecx\n" - " xor $0x200000, %%eax\n" - " push %%eax\n" - " popfl\n" - " pushfl\n" - " pop %%eax\n" - " xor %%ecx, %%eax\n" - " mov %%eax, %0\n" - " push %%ecx\n" - " popfl" - : "=m" (supported) // output - : // input - : "eax", "ecx", "memory"); // clobbered register + " pop %%eax\n" + " mov %%eax, %%ecx\n" + " xor $0x200000, %%eax\n" + " push %%eax\n" + " popfl\n" + " pushfl\n" + " pop %%eax\n" + " xor %%ecx, %%eax\n" + " mov %%eax, %0\n" + " push %%ecx\n" + " popfl" + : "=m" (supported) // output + : // input + : "eax", "ecx", "memory"); // clobbered register return supported != 0; #else return false; #endif #endif - } +} } diff --git a/src/Nazara/Graphics/Resources/DeferredShading/Shaders/LightScatteringFinal.frag b/src/Nazara/Graphics/Resources/DeferredShading/Shaders/LightScatteringFinal.frag deleted file mode 100644 index 82a05410b..000000000 --- a/src/Nazara/Graphics/Resources/DeferredShading/Shaders/LightScatteringFinal.frag +++ /dev/null @@ -1,18 +0,0 @@ -#version 140 - -out vec4 RenderTarget0; - -uniform float exposure = 0.92; -uniform sampler2D AccumulationTexture; -uniform sampler2D ColorTexture; -uniform vec2 InvTargetSize; - -void main() -{ - vec2 texCoord = gl_FragCoord.xy * InvTargetSize; - - vec4 color = texture(ColorTexture, texCoord); - vec4 lightScattering = texture(AccumulationTexture, texCoord); - - RenderTarget0 = vec4(lightScattering.rgb * exposure, 1.0) + color * 1.1; -} diff --git a/src/Nazara/Graphics/Resources/DeferredShading/Shaders/LightScatteringFinal.frag.h b/src/Nazara/Graphics/Resources/DeferredShading/Shaders/LightScatteringFinal.frag.h deleted file mode 100644 index 0b0b3fe9d..000000000 --- a/src/Nazara/Graphics/Resources/DeferredShading/Shaders/LightScatteringFinal.frag.h +++ /dev/null @@ -1 +0,0 @@ -35,118,101,114,115,105,111,110,32,49,52,48,13,10,13,10,111,117,116,32,118,101,99,52,32,82,101,110,100,101,114,84,97,114,103,101,116,48,59,13,10,13,10,117,110,105,102,111,114,109,32,102,108,111,97,116,32,101,120,112,111,115,117,114,101,32,61,32,48,46,57,50,59,13,10,117,110,105,102,111,114,109,32,115,97,109,112,108,101,114,50,68,32,65,99,99,117,109,117,108,97,116,105,111,110,84,101,120,116,117,114,101,59,13,10,117,110,105,102,111,114,109,32,115,97,109,112,108,101,114,50,68,32,67,111,108,111,114,84,101,120,116,117,114,101,59,13,10,117,110,105,102,111,114,109,32,118,101,99,50,32,73,110,118,84,97,114,103,101,116,83,105,122,101,59,13,10,13,10,118,111,105,100,32,109,97,105,110,40,41,13,10,123,13,10,9,118,101,99,50,32,116,101,120,67,111,111,114,100,32,61,32,103,108,95,70,114,97,103,67,111,111,114,100,46,120,121,32,42,32,73,110,118,84,97,114,103,101,116,83,105,122,101,59,13,10,13,10,9,118,101,99,52,32,99,111,108,111,114,32,61,32,116,101,120,116,117,114,101,40,67,111,108,111,114,84,101,120,116,117,114,101,44,32,116,101,120,67,111,111,114,100,41,59,13,10,9,118,101,99,52,32,108,105,103,104,116,83,99,97,116,116,101,114,105,110,103,32,61,32,116,101,120,116,117,114,101,40,65,99,99,117,109,117,108,97,116,105,111,110,84,101,120,116,117,114,101,44,32,116,101,120,67,111,111,114,100,41,59,13,10,13,10,9,82,101,110,100,101,114,84,97,114,103,101,116,48,32,61,32,118,101,99,52,40,108,105,103,104,116,83,99,97,116,116,101,114,105,110,103,46,114,103,98,32,42,32,101,120,112,111,115,117,114,101,44,32,49,46,48,41,32,43,32,99,111,108,111,114,32,42,32,49,46,49,59,13,10,125,13,10, \ No newline at end of file diff --git a/src/Nazara/Graphics/Sprite.cpp b/src/Nazara/Graphics/Sprite.cpp index 23fd28181..5ef82cddf 100644 --- a/src/Nazara/Graphics/Sprite.cpp +++ b/src/Nazara/Graphics/Sprite.cpp @@ -57,22 +57,20 @@ namespace Nz SparsePtr posPtr(&vertices[0].position, sizeof(VertexStruct_XYZ_Color_UV)); SparsePtr texCoordPtr(&vertices[0].uv, sizeof(VertexStruct_XYZ_Color_UV)); - const Nz::Vector3f origin(m_size.x / 2.f, m_size.y / -2.f, 0.f); - *colorPtr++ = m_color; - *posPtr++ = instanceData->transformMatrix->Transform(Vector3f(-origin)); + *posPtr++ = instanceData->transformMatrix->Transform(Vector3f(0.f)); *texCoordPtr++ = m_textureCoords.GetCorner(RectCorner_LeftTop); *colorPtr++ = m_color; - *posPtr++ = instanceData->transformMatrix->Transform(-origin + m_size.x*Vector3f::Right()); + *posPtr++ = instanceData->transformMatrix->Transform(m_size.x*Vector3f::Right()); *texCoordPtr++ = m_textureCoords.GetCorner(RectCorner_RightTop); *colorPtr++ = m_color; - *posPtr++ = instanceData->transformMatrix->Transform(-origin + m_size.y*Vector3f::Down()); + *posPtr++ = instanceData->transformMatrix->Transform(m_size.y*Vector3f::Down()); *texCoordPtr++ = m_textureCoords.GetCorner(RectCorner_LeftBottom); *colorPtr++ = m_color; - *posPtr++ = instanceData->transformMatrix->Transform(-origin + m_size.x*Vector3f::Right() + m_size.y*Vector3f::Down()); + *posPtr++ = instanceData->transformMatrix->Transform(m_size.x*Vector3f::Right() + m_size.y*Vector3f::Down()); *texCoordPtr++ = m_textureCoords.GetCorner(RectCorner_RightBottom); }