fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-27 08:20:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Bump GL_MAX_TEXTURE_COORDS from 2 to 4

Browse source 
Every platform that supports GLSL sets GL_MAX_TEXTURE_COORDS to at
least 4, so hard-code 4 for now.

This causes the following tests to pass:

    glslparsertest/glsl2/norsetto-bumptbn_sh_fp.vert
    glslparsertest/glsl2/xreal-lighting-d-omni.vert
    glslparsertest/glsl2/xreal-lighting-db-omni.vert
    glslparsertest/glsl2/xreal-lighting-dbs-omni.vert
This commit is contained in:
Ian Romanick 2010-06-07 19:10:33 -07:00
parent 19eb5896c4
commit cfb3536f10
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
ir_variable.cpp
View file

@ -97,11 +97,12 @@ generate_110_uniforms(exec_list *instructions,
}
/* FINISHME: The size of this array is implementation dependent based on the
* FINISHME: value of GL_MAX_TEXTURE_COORDS. GL_MAX_TEXTURE_COORDS must be
* FINISHME: at least 2, so hard-code 2 for now.
* FINISHME: value of GL_MAX_TEXTURE_COORDS. Every platform that supports
* FINISHME: GLSL sets GL_MAX_TEXTURE_COORDS to at least 4, so hard-code 4
* FINISHME: for now.
*/
const glsl_type *const mat4_array_type =
glsl_type::get_array_instance(glsl_type::mat4_type, 2);
glsl_type::get_array_instance(glsl_type::mat4_type, 4);
add_variable("gl_TextureMatrix", ir_var_uniform, mat4_array_type,
instructions, symtab);
@ -149,11 +150,12 @@ generate_110_vs_variables(exec_list *instructions,
generate_110_uniforms(instructions, symtab);
/* FINISHME: The size of this array is implementation dependent based on the
* FINISHME: value of GL_MAX_TEXTURE_COORDS. GL_MAX_TEXTURE_COORDS must be
* FINISHME: at least 2, so hard-code 2 for now.
* FINISHME: value of GL_MAX_TEXTURE_COORDS. Every platform that supports
* FINISHME: GLSL sets GL_MAX_TEXTURE_COORDS to at least 4, so hard-code 4
* FINISHME: for now.
*/
const glsl_type *const vec4_array_type =
glsl_type::get_array_instance(glsl_type::vec4_type, 2);
glsl_type::get_array_instance(glsl_type::vec4_type, 4);
add_variable("gl_TexCoord", ir_var_out, vec4_array_type, instructions,
symtab);
@ -229,11 +231,12 @@ generate_110_fs_variables(exec_list *instructions,
generate_110_uniforms(instructions, symtab);
/* FINISHME: The size of this array is implementation dependent based on the
* FINISHME: value of GL_MAX_TEXTURE_COORDS. GL_MAX_TEXTURE_COORDS must be
* FINISHME: at least 2, so hard-code 2 for now.
* FINISHME: value of GL_MAX_TEXTURE_COORDS. Every platform that supports
* FINISHME: GLSL sets GL_MAX_TEXTURE_COORDS to at least 4, so hard-code 4
* FINISHME: for now.
*/
const glsl_type *const vec4_array_type =
glsl_type::get_array_instance(glsl_type::vec4_type, 2);
glsl_type::get_array_instance(glsl_type::vec4_type, 4);
add_variable("gl_TexCoord", ir_var_in, vec4_array_type, instructions,
symtab);