Changes on ShaderGen for generate GLSL shaders.

This commit is contained in:
LuisAntonRebollo 2014-11-08 02:09:14 +01:00
parent c354f59b72
commit 61d3e52ad1
4 changed files with 20 additions and 18 deletions

View file

@ -203,7 +203,7 @@ void ShaderConnectorHLSL::reset()
mCurTexElem = 0;
}
void ShaderConnectorHLSL::print( Stream &stream )
void ShaderConnectorHLSL::print( Stream &stream, bool isVertexShader )
{
const char * header = "struct ";
const char * header2 = "\r\n{\r\n";
@ -269,7 +269,7 @@ void ParamsDefHLSL::assignConstantNumbers()
}
}
void VertexParamsDefHLSL::print( Stream &stream )
void VertexParamsDefHLSL::print( Stream &stream, bool isVerterShader )
{
assignConstantNumbers();
@ -305,7 +305,7 @@ void VertexParamsDefHLSL::print( Stream &stream )
stream.write( dStrlen(closer), closer );
}
void PixelParamsDefHLSL::print( Stream &stream )
void PixelParamsDefHLSL::print( Stream &stream, bool isVerterShader )
{
assignConstantNumbers();
@ -326,18 +326,18 @@ void PixelParamsDefHLSL::print( Stream &stream )
if( var->sampler )
{
dSprintf( (char*)varNum, sizeof(varNum), "register(S%d)", var->constNum );
dSprintf( (char*)varNum, sizeof(varNum), ": register(S%d)", var->constNum );
}
else
{
dSprintf( (char*)varNum, sizeof(varNum), "register(C%d)", var->constNum );
dSprintf( (char*)varNum, sizeof(varNum), ": register(C%d)", var->constNum );
}
U8 output[256];
if (var->arraySize <= 1)
dSprintf( (char*)output, sizeof(output), "uniform %-9s %-15s : %s", var->type, var->name, varNum );
dSprintf( (char*)output, sizeof(output), "uniform %-9s %-15s %s", var->type, var->name, varNum );
else
dSprintf( (char*)output, sizeof(output), "uniform %-9s %s[%d] : %s", var->type, var->name, var->arraySize, varNum );
dSprintf( (char*)output, sizeof(output), "uniform %-9s %s[%d] %s", var->type, var->name, var->arraySize, varNum );
WRITESTR( (char*) output );
}