From e802c1e08d8a4852a6fd0e56399011566b99c079 Mon Sep 17 00:00:00 2001 From: Steve K Date: Tue, 7 Oct 2014 10:44:41 -0600 Subject: [PATCH] Checkpoint some work on useLogicalIO mode for converter, and going through a BIL conversion in the compile method. That'll change soon to consume BIL directly instead of converting it from glsl. This is disabled for the moment pending figuring out the varying output count problem. Conflicts: icd/intel/CMakeLists.txt icd/intel/compiler/shader/compiler_interface.cpp --- tests/render_tests.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/render_tests.cpp b/tests/render_tests.cpp index 7567e259..2e978473 100644 --- a/tests/render_tests.cpp +++ b/tests/render_tests.cpp @@ -584,7 +584,7 @@ void XglRenderTest::CreateDefaultPipeline(XGL_PIPELINE* pipeline, XGL_SHADER* vs " gl_Position = vec4(vertices[gl_VertexID % 3], 0.0, 1.0);\n" "}\n"; static const char *vertShader2 = - "#version 330\n" + "#version 130\n" "out vec4 color;\n" "out vec4 scale;\n" "void main() {\n" @@ -596,9 +596,9 @@ void XglRenderTest::CreateDefaultPipeline(XGL_PIPELINE* pipeline, XGL_SHADER* vs " colors[0] = vec4(1.0, 0.0, 0.0, 1.0);\n" " colors[1] = vec4(0.0, 1.0, 0.0, 1.0);\n" " colors[2] = vec4(0.0, 0.0, 1.0, 1.0);\n" - " color = colors[int(mod(gl_VertexID, 3))];\n" + " color = colors[gl_VertexID % 3];\n" " scale = vec4(1.0, 1.0, 1.0, 1.0);\n" - " gl_Position = vec4(vertices[int(mod(gl_VertexID, 3))], 0.0, 1.0);\n" + " gl_Position = vec4(vertices[gl_VertexID % 3], 0.0, 1.0);\n" "}\n";