fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 00:58:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

mesa: ctx->API != API_OPENGLES --> !_mesa_is_gles1(ctx)

Browse source 
replaces direct API checks with _mesa_is_...() checks

Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/8340

Signed-off-by: Volodymyr Obohzyn volodymyr.obozhyn@globallogic.com
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/38981>
This commit is contained in:
volodymyr 2023-03-21 21:31:23 +02:00 • committed by Marge Bot
parent 401c62af8c
commit bf54a790d7
11 changed files with 59 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/mesa/main/blend.c
View file

@ -70,7 +70,7 @@ legal_src_factor(const struct gl_context *ctx, GLenum factor)
case GL_SRC1_ALPHA:
case GL_ONE_MINUS_SRC1_COLOR:
case GL_ONE_MINUS_SRC1_ALPHA:
return ctx->API != API_OPENGLES
return !_mesa_is_gles1(ctx)
&& ctx->Extensions.ARB_blend_func_extended;
default:
return GL_FALSE;
@ -103,14 +103,14 @@ legal_dst_factor(const struct gl_context *ctx, GLenum factor)
case GL_ONE_MINUS_CONSTANT_ALPHA:
return _mesa_is_desktop_gl(ctx) || _mesa_is_gles2(ctx);
case GL_SRC_ALPHA_SATURATE:
return (ctx->API != API_OPENGLES
return (!_mesa_is_gles1(ctx)
&& ctx->Extensions.ARB_blend_func_extended)
|| _mesa_is_gles3(ctx);
case GL_SRC1_COLOR:
case GL_SRC1_ALPHA:
case GL_ONE_MINUS_SRC1_COLOR:
case GL_ONE_MINUS_SRC1_ALPHA:
return ctx->API != API_OPENGLES
return !_mesa_is_gles1(ctx)
&& ctx->Extensions.ARB_blend_func_extended;
default:
return GL_FALSE;

2
src/mesa/main/bufferobj.c
View file

@ -2354,7 +2354,7 @@ buffer_data(struct gl_context *ctx, struct gl_buffer_object *bufObj,
switch (usage) {
case GL_STREAM_DRAW_ARB:
valid_usage = (ctx->API != API_OPENGLES);
valid_usage = (!_mesa_is_gles1(ctx));
break;
case GL_STATIC_DRAW_ARB:
case GL_DYNAMIC_DRAW_ARB:

78
src/mesa/main/enable.c
View file

@ -491,7 +491,7 @@ _mesa_set_enable(struct gl_context *ctx, GLenum cap, GLboolean state)
switch (cap) {
case GL_ALPHA_TEST:
if (!_mesa_is_desktop_gl_compat(ctx) && ctx->API != API_OPENGLES)
if (!_mesa_is_desktop_gl_compat(ctx) && !_mesa_is_gles1(ctx))
goto invalid_enum_error;
if (ctx->Color.AlphaEnabled == state)
return;
@ -569,7 +569,7 @@ _mesa_set_enable(struct gl_context *ctx, GLenum cap, GLboolean state)
}
break;
case GL_COLOR_MATERIAL:
if (!_mesa_is_desktop_gl_compat(ctx) && ctx->API != API_OPENGLES)
if (!_mesa_is_desktop_gl_compat(ctx) && !_mesa_is_gles1(ctx))
goto invalid_enum_error;
if (ctx->Light.ColorMaterialEnabled == state)
return;
@ -614,7 +614,7 @@ _mesa_set_enable(struct gl_context *ctx, GLenum cap, GLboolean state)
ctx->Color.DitherFlag = state;
break;
case GL_FOG:
if (!_mesa_is_desktop_gl_compat(ctx) && ctx->API != API_OPENGLES)
if (!_mesa_is_desktop_gl_compat(ctx) && !_mesa_is_gles1(ctx))
goto invalid_enum_error;
if (ctx->Fog.Enabled == state)
return;
@ -631,7 +631,7 @@ _mesa_set_enable(struct gl_context *ctx, GLenum cap, GLboolean state)
case GL_LIGHT5:
case GL_LIGHT6:
case GL_LIGHT7:
if (!_mesa_is_desktop_gl_compat(ctx) && ctx->API != API_OPENGLES)
if (!_mesa_is_desktop_gl_compat(ctx) && !_mesa_is_gles1(ctx))
goto invalid_enum_error;
if (ctx->Light.Light[cap-GL_LIGHT0].Enabled == state)
return;
@ -646,7 +646,7 @@ _mesa_set_enable(struct gl_context *ctx, GLenum cap, GLboolean state)
}
break;
case GL_LIGHTING:
if (!_mesa_is_desktop_gl_compat(ctx) && ctx->API != API_OPENGLES)
if (!_mesa_is_desktop_gl_compat(ctx) && !_mesa_is_gles1(ctx))
goto invalid_enum_error;
if (ctx->Light.Enabled == state)
return;
@ -656,7 +656,7 @@ _mesa_set_enable(struct gl_context *ctx, GLenum cap, GLboolean state)
ctx->Light.Enabled = state;
break;
case GL_LINE_SMOOTH:
if (!_mesa_is_desktop_gl(ctx) && ctx->API != API_OPENGLES)
if (!_mesa_is_desktop_gl(ctx) && !_mesa_is_gles1(ctx))
goto invalid_enum_error;
if (ctx->Line.SmoothFlag == state)
return;
@ -714,7 +714,7 @@ _mesa_set_enable(struct gl_context *ctx, GLenum cap, GLboolean state)
ctx->RepresentativeFragmentTest = state;
break;
case GL_COLOR_LOGIC_OP:
if (!_mesa_is_desktop_gl(ctx) && ctx->API != API_OPENGLES)
if (!_mesa_is_desktop_gl(ctx) && !_mesa_is_gles1(ctx))
goto invalid_enum_error;
if (ctx->Color.ColorLogicOpEnabled == state)
return;
@ -887,7 +887,7 @@ _mesa_set_enable(struct gl_context *ctx, GLenum cap, GLboolean state)
ctx->Eval.Map2Vertex4 = state;
break;
case GL_NORMALIZE:
if (!_mesa_is_desktop_gl_compat(ctx) && ctx->API != API_OPENGLES)
if (!_mesa_is_desktop_gl_compat(ctx) && !_mesa_is_gles1(ctx))
goto invalid_enum_error;
if (ctx->Transform.Normalize == state)
return;
@ -896,7 +896,7 @@ _mesa_set_enable(struct gl_context *ctx, GLenum cap, GLboolean state)
ctx->Transform.Normalize = state;
break;
case GL_POINT_SMOOTH:
if (!_mesa_is_desktop_gl_compat(ctx) && ctx->API != API_OPENGLES)
if (!_mesa_is_desktop_gl_compat(ctx) && !_mesa_is_gles1(ctx))
goto invalid_enum_error;
if (ctx->Point.SmoothFlag == state)
return;
@ -952,7 +952,7 @@ _mesa_set_enable(struct gl_context *ctx, GLenum cap, GLboolean state)
ctx->Polygon.OffsetFill = state;
break;
case GL_RESCALE_NORMAL_EXT:
if (!_mesa_is_desktop_gl_compat(ctx) && ctx->API != API_OPENGLES)
if (!_mesa_is_desktop_gl_compat(ctx) && !_mesa_is_gles1(ctx))
goto invalid_enum_error;
if (ctx->Transform.RescaleNormals == state)
return;
@ -990,14 +990,14 @@ _mesa_set_enable(struct gl_context *ctx, GLenum cap, GLboolean state)
}
break;
case GL_TEXTURE_2D:
if (!_mesa_is_desktop_gl_compat(ctx) && ctx->API != API_OPENGLES)
if (!_mesa_is_desktop_gl_compat(ctx) && !_mesa_is_gles1(ctx))
goto invalid_enum_error;
if (!enable_texture(ctx, state, TEXTURE_2D_BIT)) {
return;
}
break;
case GL_TEXTURE_3D:
if (!_mesa_is_desktop_gl_compat(ctx) && ctx->API != API_OPENGLES)
if (!_mesa_is_desktop_gl_compat(ctx) && !_mesa_is_gles1(ctx))
goto invalid_enum_error;
if (!enable_texture(ctx, state, TEXTURE_3D_BIT)) {
return;
@ -1033,7 +1033,7 @@ _mesa_set_enable(struct gl_context *ctx, GLenum cap, GLboolean state)
{
struct gl_fixedfunc_texture_unit *texUnit = get_texcoord_unit(ctx);
if (ctx->API != API_OPENGLES)
if (!_mesa_is_gles1(ctx))
goto invalid_enum_error;
if (texUnit) {
@ -1055,7 +1055,7 @@ _mesa_set_enable(struct gl_context *ctx, GLenum cap, GLboolean state)
case GL_NORMAL_ARRAY:
case GL_COLOR_ARRAY:
case GL_TEXTURE_COORD_ARRAY:
if (!_mesa_is_desktop_gl_compat(ctx) && ctx->API != API_OPENGLES)
if (!_mesa_is_desktop_gl_compat(ctx) && !_mesa_is_gles1(ctx))
goto invalid_enum_error;
client_state( ctx, ctx->Array.VAO, cap, state );
return;
@ -1068,14 +1068,14 @@ _mesa_set_enable(struct gl_context *ctx, GLenum cap, GLboolean state)
client_state( ctx, ctx->Array.VAO, cap, state );
return;
case GL_POINT_SIZE_ARRAY_OES:
if (ctx->API != API_OPENGLES)
if (!_mesa_is_gles1(ctx))
goto invalid_enum_error;
client_state( ctx, ctx->Array.VAO, cap, state );
return;
/* GL_ARB_texture_cube_map */
case GL_TEXTURE_CUBE_MAP:
if (!_mesa_is_desktop_gl_compat(ctx) && ctx->API != API_OPENGLES)
if (!_mesa_is_desktop_gl_compat(ctx) && !_mesa_is_gles1(ctx))
goto invalid_enum_error;
if (!enable_texture(ctx, state, TEXTURE_CUBE_BIT)) {
return;
@ -1095,7 +1095,7 @@ _mesa_set_enable(struct gl_context *ctx, GLenum cap, GLboolean state)
/* GL_ARB_multisample */
case GL_MULTISAMPLE_ARB:
if (!_mesa_is_desktop_gl(ctx) && ctx->API != API_OPENGLES)
if (!_mesa_is_desktop_gl(ctx) && !_mesa_is_gles1(ctx))
goto invalid_enum_error;
_mesa_set_multisample(ctx, state);
return;
@ -1108,7 +1108,7 @@ _mesa_set_enable(struct gl_context *ctx, GLenum cap, GLboolean state)
ctx->Multisample.SampleAlphaToCoverage = state;
break;
case GL_SAMPLE_ALPHA_TO_ONE_ARB:
if (!_mesa_is_desktop_gl(ctx) && ctx->API != API_OPENGLES)
if (!_mesa_is_desktop_gl(ctx) && !_mesa_is_gles1(ctx))
goto invalid_enum_error;
if (ctx->Multisample.SampleAlphaToOne == state)
return;
@ -1655,7 +1655,7 @@ _mesa_IsEnabled( GLenum cap )
switch (cap) {
case GL_ALPHA_TEST:
if (!_mesa_is_desktop_gl_compat(ctx) && ctx->API != API_OPENGLES)
if (!_mesa_is_desktop_gl_compat(ctx) && !_mesa_is_gles1(ctx))
goto invalid_enum_error;
return ctx->Color.AlphaEnabled;
case GL_AUTO_NORMAL:
@ -1680,7 +1680,7 @@ _mesa_IsEnabled( GLenum cap )
return (ctx->Transform.ClipPlanesEnabled >> p) & 1;
}
case GL_COLOR_MATERIAL:
if (!_mesa_is_desktop_gl_compat(ctx) && ctx->API != API_OPENGLES)
if (!_mesa_is_desktop_gl_compat(ctx) && !_mesa_is_gles1(ctx))
goto invalid_enum_error;
return ctx->Light.ColorMaterialEnabled;
case GL_CULL_FACE:
@ -1693,11 +1693,11 @@ _mesa_IsEnabled( GLenum cap )
case GL_DITHER:
return ctx->Color.DitherFlag;
case GL_FOG:
if (!_mesa_is_desktop_gl_compat(ctx) && ctx->API != API_OPENGLES)
if (!_mesa_is_desktop_gl_compat(ctx) && !_mesa_is_gles1(ctx))
goto invalid_enum_error;
return ctx->Fog.Enabled;
case GL_LIGHTING:
if (!_mesa_is_desktop_gl_compat(ctx) && ctx->API != API_OPENGLES)
if (!_mesa_is_desktop_gl_compat(ctx) && !_mesa_is_gles1(ctx))
goto invalid_enum_error;
return ctx->Light.Enabled;
case GL_LIGHT0:
@ -1708,11 +1708,11 @@ _mesa_IsEnabled( GLenum cap )
case GL_LIGHT5:
case GL_LIGHT6:
case GL_LIGHT7:
if (!_mesa_is_desktop_gl_compat(ctx) && ctx->API != API_OPENGLES)
if (!_mesa_is_desktop_gl_compat(ctx) && !_mesa_is_gles1(ctx))
goto invalid_enum_error;
return ctx->Light.Light[cap-GL_LIGHT0].Enabled;
case GL_LINE_SMOOTH:
if (!_mesa_is_desktop_gl(ctx) && ctx->API != API_OPENGLES)
if (!_mesa_is_desktop_gl(ctx) && !_mesa_is_gles1(ctx))
goto invalid_enum_error;
return ctx->Line.SmoothFlag;
case GL_LINE_STIPPLE:
@ -1724,7 +1724,7 @@ _mesa_IsEnabled( GLenum cap )
goto invalid_enum_error;
return ctx->Color.IndexLogicOpEnabled;
case GL_COLOR_LOGIC_OP:
if (!_mesa_is_desktop_gl(ctx) && ctx->API != API_OPENGLES)
if (!_mesa_is_desktop_gl(ctx) && !_mesa_is_gles1(ctx))
goto invalid_enum_error;
return ctx->Color.ColorLogicOpEnabled;
case GL_MAP1_COLOR_4:
@ -1800,11 +1800,11 @@ _mesa_IsEnabled( GLenum cap )
goto invalid_enum_error;
return ctx->Eval.Map2Vertex4;
case GL_NORMALIZE:
if (!_mesa_is_desktop_gl_compat(ctx) && ctx->API != API_OPENGLES)
if (!_mesa_is_desktop_gl_compat(ctx) && !_mesa_is_gles1(ctx))
goto invalid_enum_error;
return ctx->Transform.Normalize;
case GL_POINT_SMOOTH:
if (!_mesa_is_desktop_gl_compat(ctx) && ctx->API != API_OPENGLES)
if (!_mesa_is_desktop_gl_compat(ctx) && !_mesa_is_gles1(ctx))
goto invalid_enum_error;
return ctx->Point.SmoothFlag;
case GL_POLYGON_SMOOTH:
@ -1826,7 +1826,7 @@ _mesa_IsEnabled( GLenum cap )
case GL_POLYGON_OFFSET_FILL:
return ctx->Polygon.OffsetFill;
case GL_RESCALE_NORMAL_EXT:
if (!_mesa_is_desktop_gl_compat(ctx) && ctx->API != API_OPENGLES)
if (!_mesa_is_desktop_gl_compat(ctx) && !_mesa_is_gles1(ctx))
goto invalid_enum_error;
return ctx->Transform.RescaleNormals;
case GL_SCISSOR_TEST:
@ -1838,11 +1838,11 @@ _mesa_IsEnabled( GLenum cap )
goto invalid_enum_error;
return is_texture_enabled(ctx, TEXTURE_1D_BIT);
case GL_TEXTURE_2D:
if (!_mesa_is_desktop_gl_compat(ctx) && ctx->API != API_OPENGLES)
if (!_mesa_is_desktop_gl_compat(ctx) && !_mesa_is_gles1(ctx))
goto invalid_enum_error;
return is_texture_enabled(ctx, TEXTURE_2D_BIT);
case GL_TEXTURE_3D:
if (!_mesa_is_desktop_gl_compat(ctx) && ctx->API != API_OPENGLES)
if (!_mesa_is_desktop_gl_compat(ctx) && !_mesa_is_gles1(ctx))
goto invalid_enum_error;
return is_texture_enabled(ctx, TEXTURE_3D_BIT);
case GL_TEXTURE_GEN_S:
@ -1867,7 +1867,7 @@ _mesa_IsEnabled( GLenum cap )
const struct gl_fixedfunc_texture_unit *texUnit =
get_texcoord_unit(ctx);
if (ctx->API != API_OPENGLES)
if (!_mesa_is_gles1(ctx))
goto invalid_enum_error;
if (texUnit) {
@ -1880,15 +1880,15 @@ _mesa_IsEnabled( GLenum cap )
/* client-side state */
case GL_VERTEX_ARRAY:
if (!_mesa_is_desktop_gl_compat(ctx) && ctx->API != API_OPENGLES)
if (!_mesa_is_desktop_gl_compat(ctx) && !_mesa_is_gles1(ctx))
goto invalid_enum_error;
return !!(ctx->Array.VAO->Enabled & VERT_BIT_POS);
case GL_NORMAL_ARRAY:
if (!_mesa_is_desktop_gl_compat(ctx) && ctx->API != API_OPENGLES)
if (!_mesa_is_desktop_gl_compat(ctx) && !_mesa_is_gles1(ctx))
goto invalid_enum_error;
return !!(ctx->Array.VAO->Enabled & VERT_BIT_NORMAL);
case GL_COLOR_ARRAY:
if (!_mesa_is_desktop_gl_compat(ctx) && ctx->API != API_OPENGLES)
if (!_mesa_is_desktop_gl_compat(ctx) && !_mesa_is_gles1(ctx))
goto invalid_enum_error;
return !!(ctx->Array.VAO->Enabled & VERT_BIT_COLOR0);
case GL_INDEX_ARRAY:
@ -1896,7 +1896,7 @@ _mesa_IsEnabled( GLenum cap )
goto invalid_enum_error;
return !!(ctx->Array.VAO->Enabled & VERT_BIT_COLOR_INDEX);
case GL_TEXTURE_COORD_ARRAY:
if (!_mesa_is_desktop_gl_compat(ctx) && ctx->API != API_OPENGLES)
if (!_mesa_is_desktop_gl_compat(ctx) && !_mesa_is_gles1(ctx))
goto invalid_enum_error;
return !!(ctx->Array.VAO->Enabled &
VERT_BIT_TEX(ctx->Array.ActiveTexture));
@ -1913,13 +1913,13 @@ _mesa_IsEnabled( GLenum cap )
goto invalid_enum_error;
return !!(ctx->Array.VAO->Enabled & VERT_BIT_COLOR1);
case GL_POINT_SIZE_ARRAY_OES:
if (ctx->API != API_OPENGLES)
if (!_mesa_is_gles1(ctx))
goto invalid_enum_error;
return !!(ctx->Array.VAO->Enabled & VERT_BIT_POINT_SIZE);
/* GL_ARB_texture_cube_map */
case GL_TEXTURE_CUBE_MAP:
if (!_mesa_is_desktop_gl_compat(ctx) && ctx->API != API_OPENGLES)
if (!_mesa_is_desktop_gl_compat(ctx) && !_mesa_is_gles1(ctx))
goto invalid_enum_error;
return is_texture_enabled(ctx, TEXTURE_CUBE_BIT);
@ -1931,13 +1931,13 @@ _mesa_IsEnabled( GLenum cap )
/* GL_ARB_multisample */
case GL_MULTISAMPLE_ARB:
if (!_mesa_is_desktop_gl(ctx) && ctx->API != API_OPENGLES)
if (!_mesa_is_desktop_gl(ctx) && !_mesa_is_gles1(ctx))
goto invalid_enum_error;
return ctx->Multisample.Enabled;
case GL_SAMPLE_ALPHA_TO_COVERAGE_ARB:
return ctx->Multisample.SampleAlphaToCoverage;
case GL_SAMPLE_ALPHA_TO_ONE_ARB:
if (!_mesa_is_desktop_gl(ctx) && ctx->API != API_OPENGLES)
if (!_mesa_is_desktop_gl(ctx) && !_mesa_is_gles1(ctx))
goto invalid_enum_error;
return ctx->Multisample.SampleAlphaToOne;
case GL_SAMPLE_COVERAGE_ARB:

4
src/mesa/main/fbobject.c
View file

@ -2490,7 +2490,7 @@ _mesa_base_fbo_format(const struct gl_context *ctx, GLenum internalFormat)
return _mesa_has_ARB_texture_rg(ctx) || _mesa_has_EXT_texture_norm16(ctx)
? GL_RED : 0;
case GL_R8:
return ctx->API != API_OPENGLES && ctx->Extensions.ARB_texture_rg
return !_mesa_is_gles1(ctx) && ctx->Extensions.ARB_texture_rg
? GL_RED : 0;
case GL_RG:
return _mesa_has_ARB_texture_rg(ctx) ? GL_RG : 0;
@ -2498,7 +2498,7 @@ _mesa_base_fbo_format(const struct gl_context *ctx, GLenum internalFormat)
return _mesa_has_ARB_texture_rg(ctx) || _mesa_has_EXT_texture_norm16(ctx)
? GL_RG : 0;
case GL_RG8:
return ctx->API != API_OPENGLES && ctx->Extensions.ARB_texture_rg
return !_mesa_is_gles1(ctx) && ctx->Extensions.ARB_texture_rg
? GL_RG : 0;
/* signed normalized texture formats */
case GL_R8_SNORM:

2
src/mesa/main/get.c
View file

@ -2519,7 +2519,7 @@ tex_binding_to_index(const struct gl_context *ctx, GLenum binding)
case GL_TEXTURE_BINDING_2D:
return TEXTURE_2D_INDEX;
case GL_TEXTURE_BINDING_3D:
return (ctx->API != API_OPENGLES &&
return (!_mesa_is_gles1(ctx) &&
!(_mesa_is_gles2(ctx) && !ctx->Extensions.OES_texture_3D))
? TEXTURE_3D_INDEX : -1;
case GL_TEXTURE_BINDING_CUBE_MAP:

10
src/mesa/main/getstring.c
View file

@ -254,17 +254,17 @@ _get_vao_pointerv(GLenum pname, struct gl_vertex_array_object* vao,
switch (pname) {
case GL_VERTEX_ARRAY_POINTER:
if (!_mesa_is_desktop_gl_compat(ctx) && ctx->API != API_OPENGLES)
if (!_mesa_is_desktop_gl_compat(ctx) && !_mesa_is_gles1(ctx))
goto invalid_pname;
*params = (GLvoid *) vao->VertexAttrib[VERT_ATTRIB_POS].Ptr;
break;
case GL_NORMAL_ARRAY_POINTER:
if (!_mesa_is_desktop_gl_compat(ctx) && ctx->API != API_OPENGLES)
if (!_mesa_is_desktop_gl_compat(ctx) && !_mesa_is_gles1(ctx))
goto invalid_pname;
*params = (GLvoid *) vao->VertexAttrib[VERT_ATTRIB_NORMAL].Ptr;
break;
case GL_COLOR_ARRAY_POINTER:
if (!_mesa_is_desktop_gl_compat(ctx) && ctx->API != API_OPENGLES)
if (!_mesa_is_desktop_gl_compat(ctx) && !_mesa_is_gles1(ctx))
goto invalid_pname;
*params = (GLvoid *) vao->VertexAttrib[VERT_ATTRIB_COLOR0].Ptr;
break;
@ -284,7 +284,7 @@ _get_vao_pointerv(GLenum pname, struct gl_vertex_array_object* vao,
*params = (GLvoid *) vao->VertexAttrib[VERT_ATTRIB_COLOR_INDEX].Ptr;
break;
case GL_TEXTURE_COORD_ARRAY_POINTER:
if (!_mesa_is_desktop_gl_compat(ctx) && ctx->API != API_OPENGLES)
if (!_mesa_is_desktop_gl_compat(ctx) && !_mesa_is_gles1(ctx))
goto invalid_pname;
*params = (GLvoid *) vao->VertexAttrib[VERT_ATTRIB_TEX(clientUnit)].Ptr;
break;
@ -304,7 +304,7 @@ _get_vao_pointerv(GLenum pname, struct gl_vertex_array_object* vao,
*params = ctx->Select.Buffer;
break;
case GL_POINT_SIZE_ARRAY_POINTER_OES:
if (ctx->API != API_OPENGLES)
if (!_mesa_is_gles1(ctx))
goto invalid_pname;
*params = (GLvoid *) vao->VertexAttrib[VERT_ATTRIB_POINT_SIZE].Ptr;
break;

2
src/mesa/main/glformats.c
View file

@ -2477,7 +2477,7 @@ _mesa_base_tex_format(const struct gl_context *ctx, GLint internalFormat)
}
}
if (ctx->API != API_OPENGLES) {
if (!_mesa_is_gles1(ctx)) {
switch (internalFormat) {
case GL_DEPTH_COMPONENT:
case GL_DEPTH_COMPONENT16:

8
src/mesa/main/hint.c
View file

@ -51,7 +51,7 @@ _mesa_Hint( GLenum target, GLenum mode )
switch (target) {
case GL_FOG_HINT:
if (!_mesa_is_desktop_gl_compat(ctx) && ctx->API != API_OPENGLES)
if (!_mesa_is_desktop_gl_compat(ctx) && !_mesa_is_gles1(ctx))
goto invalid_target;
if (ctx->Hint.Fog == mode)
return;
@ -59,7 +59,7 @@ _mesa_Hint( GLenum target, GLenum mode )
ctx->Hint.Fog = mode;
break;
case GL_LINE_SMOOTH_HINT:
if (!_mesa_is_desktop_gl(ctx) && ctx->API != API_OPENGLES)
if (!_mesa_is_desktop_gl(ctx) && !_mesa_is_gles1(ctx))
goto invalid_target;
if (ctx->Hint.LineSmooth == mode)
return;
@ -67,7 +67,7 @@ _mesa_Hint( GLenum target, GLenum mode )
ctx->Hint.LineSmooth = mode;
break;
case GL_PERSPECTIVE_CORRECTION_HINT:
if (!_mesa_is_desktop_gl_compat(ctx) && ctx->API != API_OPENGLES)
if (!_mesa_is_desktop_gl_compat(ctx) && !_mesa_is_gles1(ctx))
goto invalid_target;
if (ctx->Hint.PerspectiveCorrection == mode)
return;
@ -75,7 +75,7 @@ _mesa_Hint( GLenum target, GLenum mode )
ctx->Hint.PerspectiveCorrection = mode;
break;
case GL_POINT_SMOOTH_HINT:
if (!_mesa_is_desktop_gl_compat(ctx) && ctx->API != API_OPENGLES)
if (!_mesa_is_desktop_gl_compat(ctx) && !_mesa_is_gles1(ctx))
goto invalid_target;
if (ctx->Hint.PointSmooth == mode)
return;

2
src/mesa/main/state.c
View file

@ -738,7 +738,7 @@ set_vertex_processing_mode(struct gl_context *ctx, gl_vertex_processing_mode m)
* impossible to reach. The meta code is careful to not use shaders in
* ES1.
*/
assert(ctx->API != API_OPENGLES);
assert(!_mesa_is_gles1(ctx));
/* Other parts of the code assume that inputs[VERT_ATTRIB_POS] through
* inputs[VERT_ATTRIB_GENERIC0-1] will be non-NULL. However, in OpenGL

2
src/mesa/main/texobj.c
View file

@ -1564,7 +1564,7 @@ _mesa_tex_target_to_index(const struct gl_context *ctx, GLenum target)
case GL_TEXTURE_2D:
return TEXTURE_2D_INDEX;
case GL_TEXTURE_3D:
return (ctx->API != API_OPENGLES &&
return (!_mesa_is_gles1(ctx) &&
!(_mesa_is_gles2(ctx) && !ctx->Extensions.OES_texture_3D))
? TEXTURE_3D_INDEX : -1;
case GL_TEXTURE_CUBE_MAP:

2
src/mesa/main/varray.c
View file

@ -1803,7 +1803,7 @@ _mesa_PointSizePointerOES(GLenum type, GLsizei stride, const GLvoid *ptr)
GET_CURRENT_CONTEXT(ctx);
GLenum format = GL_RGBA;
if (ctx->API != API_OPENGLES) {
if (!_mesa_is_gles1(ctx)) {
_mesa_error(ctx, GL_INVALID_OPERATION,
"glPointSizePointer(ES 1.x only)");
return;