mesa: OpenGL 1.3 feature GL_ARB_texture_env_dot3 is not optional
Reviewed-by: Marek Olšák <marek.olsak@amd.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14203>
This commit is contained in:
parent
61a3e68767
commit
5f14e98780
|
@ -159,7 +159,7 @@ EXT(ARB_texture_cube_map_array , ARB_texture_cube_map_array
|
||||||
EXT(ARB_texture_env_add , dummy_true , GLL, x , x , x , 1999)
|
EXT(ARB_texture_env_add , dummy_true , GLL, x , x , x , 1999)
|
||||||
EXT(ARB_texture_env_combine , dummy_true , GLL, x , x , x , 2001)
|
EXT(ARB_texture_env_combine , dummy_true , GLL, x , x , x , 2001)
|
||||||
EXT(ARB_texture_env_crossbar , ARB_texture_env_crossbar , GLL, x , x , x , 2001)
|
EXT(ARB_texture_env_crossbar , ARB_texture_env_crossbar , GLL, x , x , x , 2001)
|
||||||
EXT(ARB_texture_env_dot3 , ARB_texture_env_dot3 , GLL, x , x , x , 2001)
|
EXT(ARB_texture_env_dot3 , dummy_true , GLL, x , x , x , 2001)
|
||||||
EXT(ARB_texture_filter_anisotropic , ARB_texture_filter_anisotropic , GLL, GLC, x , x , 2017)
|
EXT(ARB_texture_filter_anisotropic , ARB_texture_filter_anisotropic , GLL, GLC, x , x , 2017)
|
||||||
EXT(ARB_texture_filter_minmax , ARB_texture_filter_minmax , GLL, GLC, x , x , 2015)
|
EXT(ARB_texture_filter_minmax , ARB_texture_filter_minmax , GLL, GLC, x , x , 2015)
|
||||||
EXT(ARB_texture_float , ARB_texture_float , GLL, GLC, x , x , 2004)
|
EXT(ARB_texture_float , ARB_texture_float , GLL, GLC, x , x , 2004)
|
||||||
|
|
|
@ -4451,7 +4451,6 @@ struct gl_extensions
|
||||||
GLboolean ARB_texture_compression_rgtc;
|
GLboolean ARB_texture_compression_rgtc;
|
||||||
GLboolean ARB_texture_cube_map_array;
|
GLboolean ARB_texture_cube_map_array;
|
||||||
GLboolean ARB_texture_env_crossbar;
|
GLboolean ARB_texture_env_crossbar;
|
||||||
GLboolean ARB_texture_env_dot3;
|
|
||||||
GLboolean ARB_texture_filter_anisotropic;
|
GLboolean ARB_texture_filter_anisotropic;
|
||||||
GLboolean ARB_texture_filter_minmax;
|
GLboolean ARB_texture_filter_minmax;
|
||||||
GLboolean ARB_texture_float;
|
GLboolean ARB_texture_float;
|
||||||
|
|
|
@ -127,8 +127,7 @@ set_combiner_mode(struct gl_context *ctx,
|
||||||
break;
|
break;
|
||||||
case GL_DOT3_RGB:
|
case GL_DOT3_RGB:
|
||||||
case GL_DOT3_RGBA:
|
case GL_DOT3_RGBA:
|
||||||
legal = (ctx->Extensions.ARB_texture_env_dot3 &&
|
legal = (pname == GL_COMBINE_RGB);
|
||||||
pname == GL_COMBINE_RGB);
|
|
||||||
break;
|
break;
|
||||||
case GL_MODULATE_ADD_ATI:
|
case GL_MODULATE_ADD_ATI:
|
||||||
case GL_MODULATE_SIGNED_ADD_ATI:
|
case GL_MODULATE_SIGNED_ADD_ATI:
|
||||||
|
|
|
@ -251,7 +251,7 @@ compute_version(const struct gl_extensions *extensions,
|
||||||
{
|
{
|
||||||
GLuint major, minor, version;
|
GLuint major, minor, version;
|
||||||
|
|
||||||
const bool ver_1_3 = (extensions->ARB_texture_env_dot3);
|
const bool ver_1_3 = true;
|
||||||
const bool ver_1_4 = (ver_1_3 &&
|
const bool ver_1_4 = (ver_1_3 &&
|
||||||
extensions->ARB_depth_texture &&
|
extensions->ARB_depth_texture &&
|
||||||
extensions->ARB_shadow &&
|
extensions->ARB_shadow &&
|
||||||
|
@ -493,11 +493,11 @@ static GLuint
|
||||||
compute_version_es1(const struct gl_extensions *extensions)
|
compute_version_es1(const struct gl_extensions *extensions)
|
||||||
{
|
{
|
||||||
/* OpenGL ES 1.0 is derived from OpenGL 1.3 */
|
/* OpenGL ES 1.0 is derived from OpenGL 1.3 */
|
||||||
const bool ver_1_0 = (extensions->ARB_texture_env_dot3);
|
const bool ver_1_0 = true;
|
||||||
/* OpenGL ES 1.1 is derived from OpenGL 1.5 */
|
/* OpenGL ES 1.1 is derived from OpenGL 1.5 */
|
||||||
const bool ver_1_1 = (ver_1_0 &&
|
const bool ver_1_1 = (extensions->EXT_point_parameters);
|
||||||
extensions->EXT_point_parameters);
|
|
||||||
|
|
||||||
|
return ver_1_1 ? 11 : 10;
|
||||||
if (ver_1_1) {
|
if (ver_1_1) {
|
||||||
return 11;
|
return 11;
|
||||||
} else if (ver_1_0) {
|
} else if (ver_1_0) {
|
||||||
|
|
|
@ -1110,7 +1110,6 @@ void st_init_extensions(struct pipe_screen *screen,
|
||||||
extensions->ARB_map_buffer_range = GL_TRUE;
|
extensions->ARB_map_buffer_range = GL_TRUE;
|
||||||
extensions->ARB_sync = GL_TRUE;
|
extensions->ARB_sync = GL_TRUE;
|
||||||
extensions->ARB_texture_env_crossbar = GL_TRUE;
|
extensions->ARB_texture_env_crossbar = GL_TRUE;
|
||||||
extensions->ARB_texture_env_dot3 = GL_TRUE;
|
|
||||||
extensions->ARB_vertex_program = GL_TRUE;
|
extensions->ARB_vertex_program = GL_TRUE;
|
||||||
extensions->ARB_vertex_shader = GL_TRUE;
|
extensions->ARB_vertex_shader = GL_TRUE;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue