Browse Source

Some fixes for Intel's Mesa

Panagiotis Christopoulos Charitos 6 years ago
parent
commit
f29763cd67

+ 1 - 1
CMakeLists.txt

@@ -366,7 +366,7 @@ endif()
 if(NOT MSVC)
 if(NOT MSVC)
 	add_definitions("-pedantic -Wall -W -Wextra -Wstrict-aliasing -Wwrite-strings -Wunused -Wunused-variable "
 	add_definitions("-pedantic -Wall -W -Wextra -Wstrict-aliasing -Wwrite-strings -Wunused -Wunused-variable "
 		"-Wno-unused-parameter -Wundef -Wno-ignored-attributes -Wno-implicit-fallthrough -Wunused-result"
 		"-Wno-unused-parameter -Wundef -Wno-ignored-attributes -Wno-implicit-fallthrough -Wunused-result"
-		"-Wconversion -Wno-sign-conversion -Wno-keyword-macro -std=c++14")
+		"-Wconversion -Wno-sign-conversion -Wno-keyword-macro -Wno-string-conversion -std=c++14")
 else()
 else()
 	add_definitions("/wd4996 /wd4244 /wd4262 /wd4267")
 	add_definitions("/wd4996 /wd4244 /wd4262 /wd4267")
 endif()
 endif()

+ 2 - 2
shaders/ApplyIrradianceToReflection.glslp

@@ -17,7 +17,7 @@ layout(set = 0, binding = 2) buffer readonly ssbo_
 	Vec4 u_irradianceDice[6u];
 	Vec4 u_irradianceDice[6u];
 };
 };
 
 
-layout(set = 0, binding = 3) uniform imageCube u_cubeTex;
+layout(set = 0, binding = 3, r11f_g11f_b10f) uniform imageCube u_cubeTex;
 
 
 void main()
 void main()
 {
 {
@@ -62,4 +62,4 @@ void main()
 	// Write it back
 	// Write it back
 	imageStore(u_cubeTex, coords, Vec4(prevColorWithIndirectDiffuse, 0.0));
 	imageStore(u_cubeTex, coords, Vec4(prevColorWithIndirectDiffuse, 0.0));
 }
 }
-#pragma anki end
+#pragma anki end

+ 1 - 1
shaders/ExponentialShadowmappingResolve.glslp

@@ -27,7 +27,7 @@ layout(push_constant, std430) uniform pc_
 layout(set = 0, binding = 0) uniform sampler u_linearAnyClampSampler;
 layout(set = 0, binding = 0) uniform sampler u_linearAnyClampSampler;
 layout(set = 0, binding = 1) uniform texture2D u_inputTex;
 layout(set = 0, binding = 1) uniform texture2D u_inputTex;
 
 
-layout(set = 0, binding = 2) uniform image2D u_outImg;
+layout(set = 0, binding = 2) uniform writeonly image2D u_outImg;
 
 
 F32 sampleLinearDepthPerspective(Vec2 uv)
 F32 sampleLinearDepthPerspective(Vec2 uv)
 {
 {

+ 1 - 1
src/anki/core/Config.cpp

@@ -96,7 +96,7 @@ Config::Config()
 	newOption("core.storagePerFrameMemorySize", 16_MB);
 	newOption("core.storagePerFrameMemorySize", 16_MB);
 	newOption("core.vertexPerFrameMemorySize", 10_MB);
 	newOption("core.vertexPerFrameMemorySize", 10_MB);
 	newOption("core.textureBufferPerFrameMemorySize", 1_MB);
 	newOption("core.textureBufferPerFrameMemorySize", 1_MB);
-	newOption("core.mainThreadCount", max(2u, getCpuCoresCount() / 2u - 1u));
+	newOption("core.mainThreadCount", max(2u, getCpuCoresCount() / 2u));
 	newOption("core.displayStats", false);
 	newOption("core.displayStats", false);
 	newOption("core.clearCaches", false);
 	newOption("core.clearCaches", false);
 }
 }