Rename version to shaderModel In order to avoid creating confusion between shader model and the actual shader's version, as specified by the #version token in a glsl shader, version was renamed to shaderModel. Change-Id: I481b6e3fc43168b504c2f2d9506422a697abc3a2 Reviewed-on: https://swiftshader-review.googlesource.com/14629 Tested-by: Alexis Hétu <sugoi@google.com> Reviewed-by: Alexis Hétu <sugoi@google.com>
diff --git a/src/Renderer/PixelProcessor.cpp b/src/Renderer/PixelProcessor.cpp index 003cfb3..f76c387 100644 --- a/src/Renderer/PixelProcessor.cpp +++ b/src/Renderer/PixelProcessor.cpp
@@ -1062,7 +1062,7 @@ const bool sprite = context->pointSpriteActive(); const bool flatShading = (context->shadingMode == SHADING_FLAT) || point; - if(context->pixelShaderVersion() < 0x0300) + if(context->pixelShaderModel() < 0x0300) { for(int coordinate = 0; coordinate < 8; coordinate++) { @@ -1079,7 +1079,7 @@ } } - if(context->textureTransformProject[coordinate] && context->pixelShaderVersion() <= 0x0103) + if(context->textureTransformProject[coordinate] && context->pixelShaderModel() <= 0x0103) { if(context->textureTransformCount[coordinate] == 2) { @@ -1173,7 +1173,7 @@ if(!routine) { - const bool integerPipeline = (context->pixelShaderVersion() <= 0x0104); + const bool integerPipeline = (context->pixelShaderModel() <= 0x0104); QuadRasterizer *generator = nullptr; if(integerPipeline)