diff options
| author | Egor Yusov <egor.yusov@gmail.com> | 2019-11-28 16:43:51 +0000 |
|---|---|---|
| committer | Egor Yusov <egor.yusov@gmail.com> | 2019-11-28 16:43:51 +0000 |
| commit | 2c4a9db3c328ea8ff9a140f22e82fcc63bf597a9 (patch) | |
| tree | e6a5dd902b902d5568fbfd96de65b825e86fc161 | |
| parent | Updated core & tools (fixed clang-formatting leftover issues) (diff) | |
| download | DiligentEngine-2c4a9db3c328ea8ff9a140f22e82fcc63bf597a9.tar.gz DiligentEngine-2c4a9db3c328ea8ff9a140f22e82fcc63bf597a9.zip | |
Fixed shader resource layout test
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | Tests/TestApp/assets/Shaders/ShaderResLayoutTestGL.psh | 3 | ||||
| -rw-r--r-- | Tests/TestApp/assets/Shaders/ShaderResLayoutTestGL.vsh | 3 |
3 files changed, 6 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 03b75be..082ca41 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,9 +39,3 @@ elseif(TARGET Asteroids) elseif(TARGET AtmosphereSample) set_property(DIRECTORY PROPERTY VS_STARTUP_PROJECT AtmosphereSample) endif() - -if(PLATFORM_WIN32) - if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/diligentterrain) - add_subdirectory(diligentterrain) - endif() -endif() diff --git a/Tests/TestApp/assets/Shaders/ShaderResLayoutTestGL.psh b/Tests/TestApp/assets/Shaders/ShaderResLayoutTestGL.psh index 2440c74..2144d7c 100644 --- a/Tests/TestApp/assets/Shaders/ShaderResLayoutTestGL.psh +++ b/Tests/TestApp/assets/Shaders/ShaderResLayoutTestGL.psh @@ -130,6 +130,9 @@ void main(void) out_Color += textureLod(sampler2D(g_sepTex2DArr_dyn[2], g_Sam_dyn), vec2(0.5, 0.5), 0.0); out_Color += textureLod(sampler2D(g_sepTex2DArr_dyn[3], g_Sam_dyn), vec2(0.5, 0.5), 0.0); + imageStore(g_StorageTexelBuff, 0, texelFetch(g_UniformTexelBuff, 0)); + imageStore(g_StorageTexelBuff_mut, 0, texelFetch(g_UniformTexelBuff_mut, 0)); + imageStore(g_tex2DStorageImg_Stat, ivec2(0, 0), vec4(1.0, 2.0, 3.0, 4.0)); imageStore(g_tex2DStorageImgArr_Mut[0], ivec2(0, 0), vec4(1.0, 2.0, 3.0, 4.0)); imageStore(g_tex2DStorageImgArr_Mut[1], ivec2(0, 0), vec4(1.0, 2.0, 3.0, 4.0)); diff --git a/Tests/TestApp/assets/Shaders/ShaderResLayoutTestGL.vsh b/Tests/TestApp/assets/Shaders/ShaderResLayoutTestGL.vsh index 18870d7..51cface 100644 --- a/Tests/TestApp/assets/Shaders/ShaderResLayoutTestGL.vsh +++ b/Tests/TestApp/assets/Shaders/ShaderResLayoutTestGL.vsh @@ -152,5 +152,8 @@ void main(void) imageStore(g_tex2DStorageImgArr_Dyn[0], ivec2(0, 0), vec4(1.0, 2.0, 3.0, 4.0)); imageStore(g_tex2DStorageImgArr_Dyn[1], ivec2(0, 0), vec4(1.0, 2.0, 3.0, 4.0)); + imageStore(g_StorageTexelBuff, 0, texelFetch(g_UniformTexelBuff, 0)); + imageStore(g_StorageTexelBuff_mut, 0, texelFetch(g_UniformTexelBuff_mut, 0)); + gl_Position = vec4(0.0, 0.0, 0.0, 1.0); } |