[1/5] WineD3D: Support the full amount of constants in GLSL

[Alexandre Julliard]

Stefan Dösinger <stefan at codeweavers.com> writes:

> Am Mittwoch, 22. April 2009 21:03:41 schrieb Stefan Dösinger:
> Use this patch instead. Henri spotted some missing parentheses in the code

It doesn't work here:

../../../tools/runtest -q -P wine -M d3d9.dll -T ../../.. -p d3d9_test.exe.so visual.c && touch visual.ok
visual.c:8782: Tests skipped: D3DFMT_G16R16F textures not supported
visual.c:8782: Tests skipped: D3DFMT_G32R32F textures not supported
visual.c:7572: Tests skipped: Card has unconditional pow2 support, skipping conditional NP2 tests
fixme:d3d_shader:print_glsl_info_log Error received from GLSL shader #4: "Vertex info\n-----------\nInternal error: assembly compile error for vertex shader at offset 42905:\n-- error message --\nline 1063, column 1:  error: too many program parameters\n-- internal assembly text --\n!!NVvp4.0\n# cgc version 2.1.0000, build date Nov  4 2008\n# command line args: \n#vendor N"...
fixme:d3d_shader:set_glsl_shader_program >>>>>>>>>>>>>>>>> GL_INVALID_OPERATION (0x502) from Find glsl program uniform locations @ glsl_shader.c / 3613
fixme:d3d_shader:set_glsl_shader_program >>>>>>>>>>>>>>>>> GL_INVALID_OPERATION (0x502) from glUseProgramObjectARB(programId) @ glsl_shader.c / 3627
fixme:d3d_shader:shader_glsl_select >>>>>>>>>>>>>>>>> GL_INVALID_OPERATION (0x502) from glUseProgramObjectARB @ glsl_shader.c / 3758
fixme:d3d_shader:shader_glsl_load_constants >>>>>>>>>>>>>>>>> GL_INVALID_OPERATION (0x502) from glUniform4fvARB @ glsl_shader.c / 574
visual.c:744: Test failed: Expected color 00ffff00, got 00000000 (for input -2.400000, instruction mova)
fixme:d3d_shader:shader_glsl_select >>>>>>>>>>>>>>>>> GL_INVALID_OPERATION (0x502) from glUseProgramObjectARB @ glsl_shader.c / 3758
fixme:d3d_shader:shader_glsl_load_constants >>>>>>>>>>>>>>>>> GL_INVALID_OPERATION (0x502) from glUniform4fvARB @ glsl_shader.c / 574
visual.c:744: Test failed: Expected color 00ffff00, got 00000000 (for input -1.600000, instruction mova)
fixme:d3d_shader:shader_glsl_select >>>>>>>>>>>>>>>>> GL_INVALID_OPERATION (0x502) from glUseProgramObjectARB @ glsl_shader.c / 3758
fixme:d3d_shader:shader_glsl_load_constants >>>>>>>>>>>>>>>>> GL_INVALID_OPERATION (0x502) from glUniform4fvARB @ glsl_shader.c / 574
visual.c:744: Test failed: Expected color 0000ffff, got 00000000 (for input -0.400000, instruction mova)
fixme:d3d_shader:shader_glsl_select >>>>>>>>>>>>>>>>> GL_INVALID_OPERATION (0x502) from glUseProgramObjectARB @ glsl_shader.c / 3758
fixme:d3d_shader:shader_glsl_load_constants >>>>>>>>>>>>>>>>> GL_INVALID_OPERATION (0x502) from glUniform4fvARB @ glsl_shader.c / 574
visual.c:744: Test failed: Expected color 0000ffff, got 00000000 (for input 0.400000, instruction mova)
fixme:d3d_shader:shader_glsl_select >>>>>>>>>>>>>>>>> GL_INVALID_OPERATION (0x502) from glUseProgramObjectARB @ glsl_shader.c / 3758
fixme:d3d_shader:shader_glsl_load_constants >>>>>>>>>>>>>>>>> GL_INVALID_OPERATION (0x502) from glUniform4fvARB @ glsl_shader.c / 574
visual.c:744: Test failed: Expected color 00ff00ff, got 00000000 (for input 1.600000, instruction mova)
fixme:d3d_shader:shader_glsl_select >>>>>>>>>>>>>>>>> GL_INVALID_OPERATION (0x502) from glUseProgramObjectARB @ glsl_shader.c / 3758
fixme:d3d_shader:shader_glsl_load_constants >>>>>>>>>>>>>>>>> GL_INVALID_OPERATION (0x502) from glUniform4fvARB @ glsl_shader.c / 574
visual.c:744: Test failed: Expected color 00ff00ff, got 00000000 (for input 2.400000, instruction mova)
visual.c:8643: Tests skipped: Only 1 simultaneous render target supported, skipping MRT test
make[2]: *** [visual.ok] Error 6

-- 
Alexandre Julliard
julliard at winehq.org