Shader cleanup
A couple of class members from PixelShader and VertexShader
were still public. Fixed that in this cleanup.
Change-Id: I2dfaac7fd4cecdc791f1ef7236148e74c4b5b486
Reviewed-on: https://swiftshader-review.googlesource.com/5850
Tested-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
diff --git a/src/Renderer/VertexProcessor.cpp b/src/Renderer/VertexProcessor.cpp
index 574cdbb..ced0870 100644
--- a/src/Renderer/VertexProcessor.cpp
+++ b/src/Renderer/VertexProcessor.cpp
@@ -909,8 +909,8 @@
state.fixedFunction = !context->vertexShader && context->pixelShaderVersion() < 0x0300;
state.textureSampling = context->vertexShader ? context->vertexShader->containsTextureSampling() : false;
- state.positionRegister = context->vertexShader ? context->vertexShader->positionRegister : Pos;
- state.pointSizeRegister = context->vertexShader ? context->vertexShader->pointSizeRegister : Pts;
+ state.positionRegister = context->vertexShader ? context->vertexShader->getPositionRegister() : Pos;
+ state.pointSizeRegister = context->vertexShader ? context->vertexShader->getPointSizeRegister() : Pts;
state.vertexBlendMatrixCount = context->vertexBlendMatrixCountActive();
state.indexedVertexBlendEnable = context->indexedVertexBlendActive();
@@ -985,10 +985,10 @@
{
for(int i = 0; i < MAX_VERTEX_OUTPUTS; i++)
{
- state.output[i].xWrite = context->vertexShader->output[i][0].active();
- state.output[i].yWrite = context->vertexShader->output[i][1].active();
- state.output[i].zWrite = context->vertexShader->output[i][2].active();
- state.output[i].wWrite = context->vertexShader->output[i][3].active();
+ state.output[i].xWrite = context->vertexShader->getOutput(i, 0).active();
+ state.output[i].yWrite = context->vertexShader->getOutput(i, 1).active();
+ state.output[i].zWrite = context->vertexShader->getOutput(i, 2).active();
+ state.output[i].wWrite = context->vertexShader->getOutput(i, 3).active();
}
}
else if(!context->preTransformed || context->pixelShaderVersion() < 0x0300)
