ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: Order the helper constants a bit better.

This commit is contained in:
Stefan Dösinger 2010-05-12 22:35:23 +02:00 committed by Alexandre Julliard
parent a1710a32f3
commit a0143e142b
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dlls/wined3d/arb_program_shader.c
View File

@ -140,10 +140,10 @@ static const char *arb_get_helper_value(enum wined3d_shader_type shader, enum ar
{ {
switch (value) switch (value)
{ {
case ARB_ZERO: return "ps_helper_const.y"; case ARB_ZERO: return "ps_helper_const.x";
case ARB_ONE: return "ps_helper_const.x"; case ARB_ONE: return "ps_helper_const.y";
case ARB_TWO: return "coefmul.x"; case ARB_TWO: return "coefmul.x";
case ARB_0001: return "helper_const.yyyx"; case ARB_0001: return "helper_const.xxxy";
default: break; default: break;
} }
} }
@ -151,11 +151,11 @@ static const char *arb_get_helper_value(enum wined3d_shader_type shader, enum ar
{ {
switch (value) switch (value)
{ {
case ARB_ZERO: return "helper_const.w"; case ARB_ZERO: return "helper_const.x";
case ARB_ONE: return "helper_const.y"; case ARB_ONE: return "helper_const.y";
case ARB_TWO: return "helper_const.x"; case ARB_TWO: return "helper_const.z";
case ARB_0001: return "helper_const.wwwy"; case ARB_0001: return "helper_const.xxxy";
case ARB_VS_REL_OFFSET: return "helper_const.z"; case ARB_VS_REL_OFFSET: return "helper_const.w";
} }
} }
FIXME("Unmanaged %s shader helper constant requested: %u\n", FIXME("Unmanaged %s shader helper constant requested: %u\n",
@ -3550,7 +3550,7 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShaderImpl *This, struct
if(dcl_td) shader_addline(buffer, "TEMP TD;\n"); /* Used for sRGB writing */ if(dcl_td) shader_addline(buffer, "TEMP TD;\n"); /* Used for sRGB writing */
shader_addline(buffer, "PARAM coefdiv = { 0.5, 0.25, 0.125, 0.0625 };\n"); shader_addline(buffer, "PARAM coefdiv = { 0.5, 0.25, 0.125, 0.0625 };\n");
shader_addline(buffer, "PARAM coefmul = { 2, 4, 8, 16 };\n"); shader_addline(buffer, "PARAM coefmul = { 2, 4, 8, 16 };\n");
shader_addline(buffer, "PARAM ps_helper_const = { 1.0, 0.0, 0.0, 0.0 };\n"); shader_addline(buffer, "PARAM ps_helper_const = { 0.0, 1.0, 0.0, 0.0 };\n");
if (reg_maps->shader_version.major < 2) if (reg_maps->shader_version.major < 2)
{ {
@ -4046,7 +4046,7 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShaderImpl *This, struct
shader_addline(buffer, "TEMP TMP_OUT;\n"); shader_addline(buffer, "TEMP TMP_OUT;\n");
if(need_helper_const(gl_info)) { if(need_helper_const(gl_info)) {
shader_addline(buffer, "PARAM helper_const = { 2.0, 1.0, %d.0, 0.0 };\n", This->rel_offset); shader_addline(buffer, "PARAM helper_const = { 0.0, 1.0, 2.0, %d.0 };\n", This->rel_offset);
} }
if(need_mova_const((IWineD3DBaseShader *) This, gl_info)) { if(need_mova_const((IWineD3DBaseShader *) This, gl_info)) {
shader_addline(buffer, "PARAM mova_const = { 0.5, 0.0, 2.0, 1.0 };\n"); shader_addline(buffer, "PARAM mova_const = { 0.5, 0.0, 2.0, 1.0 };\n");