#include "varray.h"
-static void
-update_derived_primitive_restart_state(struct gl_context *ctx)
+void
+_mesa_update_derived_primitive_restart_state(struct gl_context *ctx)
{
- /* Update derived primitive restart state.
- */
- ctx->Array._PrimitiveRestart = ctx->Array.PrimitiveRestart
- || ctx->Array.PrimitiveRestartFixedIndex;
+ ctx->Array._PrimitiveRestart = ctx->Array.PrimitiveRestart ||
+ ctx->Array.PrimitiveRestartFixedIndex;
+ ctx->Array._RestartIndex[0] = _mesa_primitive_restart_index(ctx, 1);
+ ctx->Array._RestartIndex[1] = _mesa_primitive_restart_index(ctx, 2);
+ ctx->Array._RestartIndex[3] = _mesa_primitive_restart_index(ctx, 4);
}
* Helper to enable/disable VAO client-side state.
*/
static void
-vao_state(struct gl_context *ctx, gl_vert_attrib attr, GLboolean state)
+vao_state(struct gl_context *ctx, struct gl_vertex_array_object* vao,
+ gl_vert_attrib attr, GLboolean state)
{
if (state)
- _mesa_enable_vertex_array_attrib(ctx, ctx->Array.VAO, attr);
+ _mesa_enable_vertex_array_attrib(ctx, vao, attr);
else
- _mesa_disable_vertex_array_attrib(ctx, ctx->Array.VAO, attr);
+ _mesa_disable_vertex_array_attrib(ctx, vao, attr);
}
* Helper to enable/disable client-side state.
*/
static void
-client_state(struct gl_context *ctx, GLenum cap, GLboolean state)
+client_state(struct gl_context *ctx, struct gl_vertex_array_object* vao,
+ GLenum cap, GLboolean state)
{
switch (cap) {
case GL_VERTEX_ARRAY:
- vao_state(ctx, VERT_ATTRIB_POS, state);
+ vao_state(ctx, vao, VERT_ATTRIB_POS, state);
break;
case GL_NORMAL_ARRAY:
- vao_state(ctx, VERT_ATTRIB_NORMAL, state);
+ vao_state(ctx, vao, VERT_ATTRIB_NORMAL, state);
break;
case GL_COLOR_ARRAY:
- vao_state(ctx, VERT_ATTRIB_COLOR0, state);
+ vao_state(ctx, vao, VERT_ATTRIB_COLOR0, state);
break;
case GL_INDEX_ARRAY:
- vao_state(ctx, VERT_ATTRIB_COLOR_INDEX, state);
+ vao_state(ctx, vao, VERT_ATTRIB_COLOR_INDEX, state);
break;
case GL_TEXTURE_COORD_ARRAY:
- vao_state(ctx, VERT_ATTRIB_TEX(ctx->Array.ActiveTexture), state);
+ vao_state(ctx, vao, VERT_ATTRIB_TEX(ctx->Array.ActiveTexture), state);
break;
case GL_EDGE_FLAG_ARRAY:
- vao_state(ctx, VERT_ATTRIB_EDGEFLAG, state);
+ vao_state(ctx, vao, VERT_ATTRIB_EDGEFLAG, state);
break;
case GL_FOG_COORDINATE_ARRAY_EXT:
- vao_state(ctx, VERT_ATTRIB_FOG, state);
+ vao_state(ctx, vao, VERT_ATTRIB_FOG, state);
break;
case GL_SECONDARY_COLOR_ARRAY_EXT:
- vao_state(ctx, VERT_ATTRIB_COLOR1, state);
+ vao_state(ctx, vao, VERT_ATTRIB_COLOR1, state);
break;
case GL_POINT_SIZE_ARRAY_OES:
- FLUSH_VERTICES(ctx, _NEW_PROGRAM);
- ctx->VertexProgram.PointSizeEnabled = state;
- vao_state(ctx, VERT_ATTRIB_POINT_SIZE, state);
+ if (ctx->VertexProgram.PointSizeEnabled != state) {
+ FLUSH_VERTICES(ctx, _NEW_PROGRAM);
+ ctx->VertexProgram.PointSizeEnabled = state;
+ }
+ vao_state(ctx, vao, VERT_ATTRIB_POINT_SIZE, state);
break;
/* GL_NV_primitive_restart */
case GL_PRIMITIVE_RESTART_NV:
- if (!ctx->Extensions.NV_primitive_restart)
+ if (!_mesa_has_NV_primitive_restart(ctx))
goto invalid_enum_error;
if (ctx->Array.PrimitiveRestart == state)
return;
FLUSH_VERTICES(ctx, 0);
ctx->Array.PrimitiveRestart = state;
- update_derived_primitive_restart_state(ctx);
+ _mesa_update_derived_primitive_restart_state(ctx);
return;
default:
}
+/* Helper for GL_EXT_direct_state_access following functions:
+ * - EnableClientStateIndexedEXT
+ * - EnableClientStateiEXT
+ * - DisableClientStateIndexedEXT
+ * - DisableClientStateiEXT
+ */
+static void
+client_state_i(struct gl_context *ctx, struct gl_vertex_array_object* vao,
+ GLenum cap, GLuint index, GLboolean state)
+{
+ int saved_active;
+
+ if (cap != GL_TEXTURE_COORD_ARRAY) {
+ _mesa_error(ctx, GL_INVALID_ENUM, "gl%sClientStateiEXT(cap=%s)",
+ state ? "Enable" : "Disable",
+ _mesa_enum_to_string(cap));
+ return;
+ }
+
+ if (index >= ctx->Const.MaxTextureCoordUnits) {
+ _mesa_error(ctx, GL_INVALID_VALUE, "gl%sClientStateiEXT(index=%d)",
+ state ? "Enable" : "Disable",
+ index);
+ return;
+ }
+
+ saved_active = ctx->Array.ActiveTexture;
+ _mesa_ClientActiveTexture(GL_TEXTURE0 + index);
+ client_state(ctx, vao, cap, state);
+ _mesa_ClientActiveTexture(GL_TEXTURE0 + saved_active);
+}
+
+
/**
* Enable GL capability.
* \param cap state to enable/disable.
_mesa_EnableClientState( GLenum cap )
{
GET_CURRENT_CONTEXT(ctx);
- client_state( ctx, cap, GL_TRUE );
+ client_state( ctx, ctx->Array.VAO, cap, GL_TRUE );
+}
+
+
+void GLAPIENTRY
+_mesa_EnableVertexArrayEXT( GLuint vaobj, GLenum cap )
+{
+ GET_CURRENT_CONTEXT(ctx);
+ struct gl_vertex_array_object* vao = _mesa_lookup_vao_err(ctx, vaobj,
+ true,
+ "glEnableVertexArrayEXT");
+ if (!vao)
+ return;
+
+ /* The EXT_direct_state_access spec says:
+ * "Additionally EnableVertexArrayEXT and DisableVertexArrayEXT accept
+ * the tokens TEXTURE0 through TEXTUREn where n is less than the
+ * implementation-dependent limit of MAX_TEXTURE_COORDS. For these
+ * GL_TEXTUREi tokens, EnableVertexArrayEXT and DisableVertexArrayEXT
+ * act identically to EnableVertexArrayEXT(vaobj, TEXTURE_COORD_ARRAY)
+ * or DisableVertexArrayEXT(vaobj, TEXTURE_COORD_ARRAY) respectively
+ * as if the active client texture is set to texture coordinate set i
+ * based on the token TEXTUREi indicated by array."
+ */
+ if (GL_TEXTURE0 <= cap && cap < GL_TEXTURE0 + ctx->Const.MaxTextureCoordUnits) {
+ GLuint saved_active = ctx->Array.ActiveTexture;
+ _mesa_ClientActiveTexture(cap);
+ client_state(ctx, vao, GL_TEXTURE_COORD_ARRAY, GL_TRUE);
+ _mesa_ClientActiveTexture(GL_TEXTURE0 + saved_active);
+ } else {
+ client_state(ctx, vao, cap, GL_TRUE);
+ }
+}
+
+
+void GLAPIENTRY
+_mesa_EnableClientStateiEXT( GLenum cap, GLuint index )
+{
+ GET_CURRENT_CONTEXT(ctx);
+ client_state_i(ctx, ctx->Array.VAO, cap, index, GL_TRUE);
}
_mesa_DisableClientState( GLenum cap )
{
GET_CURRENT_CONTEXT(ctx);
- client_state( ctx, cap, GL_FALSE );
+ client_state( ctx, ctx->Array.VAO, cap, GL_FALSE );
}
+void GLAPIENTRY
+_mesa_DisableVertexArrayEXT( GLuint vaobj, GLenum cap )
+{
+ GET_CURRENT_CONTEXT(ctx);
+ struct gl_vertex_array_object* vao = _mesa_lookup_vao_err(ctx, vaobj,
+ true,
+ "glDisableVertexArrayEXT");
+ if (!vao)
+ return;
-#define CHECK_EXTENSION(EXTNAME) \
- if (!ctx->Extensions.EXTNAME) { \
- goto invalid_enum_error; \
+ /* The EXT_direct_state_access spec says:
+ * "Additionally EnableVertexArrayEXT and DisableVertexArrayEXT accept
+ * the tokens TEXTURE0 through TEXTUREn where n is less than the
+ * implementation-dependent limit of MAX_TEXTURE_COORDS. For these
+ * GL_TEXTUREi tokens, EnableVertexArrayEXT and DisableVertexArrayEXT
+ * act identically to EnableVertexArrayEXT(vaobj, TEXTURE_COORD_ARRAY)
+ * or DisableVertexArrayEXT(vaobj, TEXTURE_COORD_ARRAY) respectively
+ * as if the active client texture is set to texture coordinate set i
+ * based on the token TEXTUREi indicated by array."
+ */
+ if (GL_TEXTURE0 <= cap && cap < GL_TEXTURE0 + ctx->Const.MaxTextureCoordUnits) {
+ GLuint saved_active = ctx->Array.ActiveTexture;
+ _mesa_ClientActiveTexture(cap);
+ client_state(ctx, vao, GL_TEXTURE_COORD_ARRAY, GL_FALSE);
+ _mesa_ClientActiveTexture(GL_TEXTURE0 + saved_active);
+ } else {
+ client_state(ctx, vao, cap, GL_FALSE);
}
+}
-#define CHECK_EXTENSION2(EXT1, EXT2) \
- if (!ctx->Extensions.EXT1 && !ctx->Extensions.EXT2) { \
- goto invalid_enum_error; \
- }
+void GLAPIENTRY
+_mesa_DisableClientStateiEXT( GLenum cap, GLuint index )
+{
+ GET_CURRENT_CONTEXT(ctx);
+ client_state_i(ctx, ctx->Array.VAO, cap, index, GL_FALSE);
+}
/**
* Return pointer to current texture unit for setting/getting coordinate
enable_texture(struct gl_context *ctx, GLboolean state, GLbitfield texBit)
{
struct gl_fixedfunc_texture_unit *texUnit =
- _mesa_get_current_fixedfunc_tex_unit(ctx);
+ _mesa_get_fixedfunc_tex_unit(ctx, ctx->Texture.CurrentUnit);
if (!texUnit)
return GL_FALSE;
goto invalid_enum_error;
if (ctx->Eval.AutoNormal == state)
return;
- FLUSH_VERTICES(ctx, _NEW_EVAL);
+ FLUSH_VERTICES(ctx, 0);
+ vbo_exec_update_eval_maps(ctx);
ctx->Eval.AutoNormal = state;
break;
case GL_BLEND:
_mesa_flush_vertices_for_blend_adv(ctx, newEnabled,
ctx->Color._AdvancedBlendMode);
ctx->Color.BlendEnabled = newEnabled;
+ _mesa_update_allow_draw_out_of_order(ctx);
}
}
break;
FLUSH_VERTICES(ctx, ctx->DriverFlags.NewDepth ? 0 : _NEW_DEPTH);
ctx->NewDriverState |= ctx->DriverFlags.NewDepth;
ctx->Depth.Test = state;
+ _mesa_update_allow_draw_out_of_order(ctx);
break;
case GL_DEBUG_OUTPUT:
case GL_DEBUG_OUTPUT_SYNCHRONOUS_ARB:
FLUSH_VERTICES(ctx, ctx->DriverFlags.NewLogicOp ? 0 : _NEW_COLOR);
ctx->NewDriverState |= ctx->DriverFlags.NewLogicOp;
ctx->Color.ColorLogicOpEnabled = state;
+ _mesa_update_allow_draw_out_of_order(ctx);
break;
case GL_MAP1_COLOR_4:
if (ctx->API != API_OPENGL_COMPAT)
goto invalid_enum_error;
if (ctx->Eval.Map1Color4 == state)
return;
- FLUSH_VERTICES(ctx, _NEW_EVAL);
+ FLUSH_VERTICES(ctx, 0);
+ vbo_exec_update_eval_maps(ctx);
ctx->Eval.Map1Color4 = state;
break;
case GL_MAP1_INDEX:
goto invalid_enum_error;
if (ctx->Eval.Map1Index == state)
return;
- FLUSH_VERTICES(ctx, _NEW_EVAL);
+ FLUSH_VERTICES(ctx, 0);
+ vbo_exec_update_eval_maps(ctx);
ctx->Eval.Map1Index = state;
break;
case GL_MAP1_NORMAL:
goto invalid_enum_error;
if (ctx->Eval.Map1Normal == state)
return;
- FLUSH_VERTICES(ctx, _NEW_EVAL);
+ FLUSH_VERTICES(ctx, 0);
+ vbo_exec_update_eval_maps(ctx);
ctx->Eval.Map1Normal = state;
break;
case GL_MAP1_TEXTURE_COORD_1:
goto invalid_enum_error;
if (ctx->Eval.Map1TextureCoord1 == state)
return;
- FLUSH_VERTICES(ctx, _NEW_EVAL);
+ FLUSH_VERTICES(ctx, 0);
+ vbo_exec_update_eval_maps(ctx);
ctx->Eval.Map1TextureCoord1 = state;
break;
case GL_MAP1_TEXTURE_COORD_2:
goto invalid_enum_error;
if (ctx->Eval.Map1TextureCoord2 == state)
return;
- FLUSH_VERTICES(ctx, _NEW_EVAL);
+ FLUSH_VERTICES(ctx, 0);
+ vbo_exec_update_eval_maps(ctx);
ctx->Eval.Map1TextureCoord2 = state;
break;
case GL_MAP1_TEXTURE_COORD_3:
goto invalid_enum_error;
if (ctx->Eval.Map1TextureCoord3 == state)
return;
- FLUSH_VERTICES(ctx, _NEW_EVAL);
+ FLUSH_VERTICES(ctx, 0);
+ vbo_exec_update_eval_maps(ctx);
ctx->Eval.Map1TextureCoord3 = state;
break;
case GL_MAP1_TEXTURE_COORD_4:
goto invalid_enum_error;
if (ctx->Eval.Map1TextureCoord4 == state)
return;
- FLUSH_VERTICES(ctx, _NEW_EVAL);
+ FLUSH_VERTICES(ctx, 0);
+ vbo_exec_update_eval_maps(ctx);
ctx->Eval.Map1TextureCoord4 = state;
break;
case GL_MAP1_VERTEX_3:
goto invalid_enum_error;
if (ctx->Eval.Map1Vertex3 == state)
return;
- FLUSH_VERTICES(ctx, _NEW_EVAL);
+ FLUSH_VERTICES(ctx, 0);
+ vbo_exec_update_eval_maps(ctx);
ctx->Eval.Map1Vertex3 = state;
break;
case GL_MAP1_VERTEX_4:
goto invalid_enum_error;
if (ctx->Eval.Map1Vertex4 == state)
return;
- FLUSH_VERTICES(ctx, _NEW_EVAL);
+ FLUSH_VERTICES(ctx, 0);
+ vbo_exec_update_eval_maps(ctx);
ctx->Eval.Map1Vertex4 = state;
break;
case GL_MAP2_COLOR_4:
goto invalid_enum_error;
if (ctx->Eval.Map2Color4 == state)
return;
- FLUSH_VERTICES(ctx, _NEW_EVAL);
+ FLUSH_VERTICES(ctx, 0);
+ vbo_exec_update_eval_maps(ctx);
ctx->Eval.Map2Color4 = state;
break;
case GL_MAP2_INDEX:
goto invalid_enum_error;
if (ctx->Eval.Map2Index == state)
return;
- FLUSH_VERTICES(ctx, _NEW_EVAL);
+ FLUSH_VERTICES(ctx, 0);
+ vbo_exec_update_eval_maps(ctx);
ctx->Eval.Map2Index = state;
break;
case GL_MAP2_NORMAL:
goto invalid_enum_error;
if (ctx->Eval.Map2Normal == state)
return;
- FLUSH_VERTICES(ctx, _NEW_EVAL);
+ FLUSH_VERTICES(ctx, 0);
+ vbo_exec_update_eval_maps(ctx);
ctx->Eval.Map2Normal = state;
break;
case GL_MAP2_TEXTURE_COORD_1:
goto invalid_enum_error;
if (ctx->Eval.Map2TextureCoord1 == state)
return;
- FLUSH_VERTICES(ctx, _NEW_EVAL);
+ FLUSH_VERTICES(ctx, 0);
+ vbo_exec_update_eval_maps(ctx);
ctx->Eval.Map2TextureCoord1 = state;
break;
case GL_MAP2_TEXTURE_COORD_2:
goto invalid_enum_error;
if (ctx->Eval.Map2TextureCoord2 == state)
return;
- FLUSH_VERTICES(ctx, _NEW_EVAL);
+ FLUSH_VERTICES(ctx, 0);
+ vbo_exec_update_eval_maps(ctx);
ctx->Eval.Map2TextureCoord2 = state;
break;
case GL_MAP2_TEXTURE_COORD_3:
goto invalid_enum_error;
if (ctx->Eval.Map2TextureCoord3 == state)
return;
- FLUSH_VERTICES(ctx, _NEW_EVAL);
+ FLUSH_VERTICES(ctx, 0);
+ vbo_exec_update_eval_maps(ctx);
ctx->Eval.Map2TextureCoord3 = state;
break;
case GL_MAP2_TEXTURE_COORD_4:
goto invalid_enum_error;
if (ctx->Eval.Map2TextureCoord4 == state)
return;
- FLUSH_VERTICES(ctx, _NEW_EVAL);
+ FLUSH_VERTICES(ctx, 0);
+ vbo_exec_update_eval_maps(ctx);
ctx->Eval.Map2TextureCoord4 = state;
break;
case GL_MAP2_VERTEX_3:
goto invalid_enum_error;
if (ctx->Eval.Map2Vertex3 == state)
return;
- FLUSH_VERTICES(ctx, _NEW_EVAL);
+ FLUSH_VERTICES(ctx, 0);
+ vbo_exec_update_eval_maps(ctx);
ctx->Eval.Map2Vertex3 = state;
break;
case GL_MAP2_VERTEX_4:
goto invalid_enum_error;
if (ctx->Eval.Map2Vertex4 == state)
return;
- FLUSH_VERTICES(ctx, _NEW_EVAL);
+ FLUSH_VERTICES(ctx, 0);
+ vbo_exec_update_eval_maps(ctx);
ctx->Eval.Map2Vertex4 = state;
break;
case GL_NORMALIZE:
FLUSH_VERTICES(ctx, ctx->DriverFlags.NewStencil ? 0 : _NEW_STENCIL);
ctx->NewDriverState |= ctx->DriverFlags.NewStencil;
ctx->Stencil.Enabled = state;
+ _mesa_update_allow_draw_out_of_order(ctx);
break;
case GL_TEXTURE_1D:
if (ctx->API != API_OPENGL_COMPAT)
case GL_TEXTURE_COORD_ARRAY:
if (ctx->API != API_OPENGL_COMPAT && ctx->API != API_OPENGLES)
goto invalid_enum_error;
- client_state( ctx, cap, state );
+ client_state( ctx, ctx->Array.VAO, cap, state );
return;
case GL_INDEX_ARRAY:
case GL_EDGE_FLAG_ARRAY:
case GL_SECONDARY_COLOR_ARRAY_EXT:
if (ctx->API != API_OPENGL_COMPAT)
goto invalid_enum_error;
- client_state( ctx, cap, state );
+ client_state( ctx, ctx->Array.VAO, cap, state );
return;
case GL_POINT_SIZE_ARRAY_OES:
if (ctx->API != API_OPENGLES)
goto invalid_enum_error;
- client_state( ctx, cap, state );
+ client_state( ctx, ctx->Array.VAO, cap, state );
return;
/* GL_ARB_texture_cube_map */
/* GL_ARB_sample_shading */
case GL_SAMPLE_SHADING:
- if (!_mesa_is_desktop_gl(ctx) && !_mesa_is_gles3(ctx))
+ if (!_mesa_has_ARB_sample_shading(ctx) && !_mesa_is_gles3(ctx))
goto invalid_enum_error;
- CHECK_EXTENSION(ARB_sample_shading);
if (ctx->Multisample.SampleShading == state)
return;
FLUSH_VERTICES(ctx, ctx->DriverFlags.NewSampleShading ? 0 :
/* GL_NV_point_sprite */
case GL_POINT_SPRITE_NV:
- if (ctx->API != API_OPENGL_COMPAT && ctx->API != API_OPENGLES)
+ if (!(ctx->API == API_OPENGL_COMPAT &&
+ (_mesa_has_ARB_point_sprite(ctx) ||
+ _mesa_has_NV_point_sprite(ctx))) &&
+ !_mesa_has_OES_point_sprite(ctx))
goto invalid_enum_error;
- CHECK_EXTENSION2(NV_point_sprite, ARB_point_sprite);
if (ctx->Point.PointSprite == state)
return;
FLUSH_VERTICES(ctx, _NEW_POINT);
break;
case GL_VERTEX_PROGRAM_ARB:
- if (ctx->API != API_OPENGL_COMPAT)
+ if (!_mesa_has_ARB_vertex_program(ctx))
goto invalid_enum_error;
- CHECK_EXTENSION(ARB_vertex_program);
if (ctx->VertexProgram.Enabled == state)
return;
FLUSH_VERTICES(ctx, _NEW_PROGRAM);
/* This was added with ARB_vertex_program, but it is also used with
* GLSL vertex shaders on desktop.
*/
- if (!_mesa_is_desktop_gl(ctx))
+ if (!_mesa_has_ARB_vertex_program(ctx) &&
+ ctx->API != API_OPENGL_CORE)
goto invalid_enum_error;
- CHECK_EXTENSION(ARB_vertex_program);
if (ctx->VertexProgram.PointSizeEnabled == state)
return;
FLUSH_VERTICES(ctx, _NEW_PROGRAM);
ctx->VertexProgram.PointSizeEnabled = state;
break;
case GL_VERTEX_PROGRAM_TWO_SIDE_ARB:
- if (ctx->API != API_OPENGL_COMPAT)
+ if (!_mesa_has_ARB_vertex_program(ctx))
goto invalid_enum_error;
- CHECK_EXTENSION(ARB_vertex_program);
if (ctx->VertexProgram.TwoSideEnabled == state)
return;
FLUSH_VERTICES(ctx, _NEW_PROGRAM);
/* GL_NV_texture_rectangle */
case GL_TEXTURE_RECTANGLE_NV:
- if (ctx->API != API_OPENGL_COMPAT)
+ if (!_mesa_has_NV_texture_rectangle(ctx))
goto invalid_enum_error;
- CHECK_EXTENSION(NV_texture_rectangle);
if (!enable_texture(ctx, state, TEXTURE_RECT_BIT)) {
return;
}
/* GL_EXT_stencil_two_side */
case GL_STENCIL_TEST_TWO_SIDE_EXT:
- if (ctx->API != API_OPENGL_COMPAT)
+ if (!_mesa_has_EXT_stencil_two_side(ctx))
goto invalid_enum_error;
- CHECK_EXTENSION(EXT_stencil_two_side);
if (ctx->Stencil.TestTwoSide == state)
return;
FLUSH_VERTICES(ctx, ctx->DriverFlags.NewStencil ? 0 : _NEW_STENCIL);
/* GL_EXT_depth_bounds_test */
case GL_DEPTH_BOUNDS_TEST_EXT:
- if (!_mesa_is_desktop_gl(ctx))
+ if (!_mesa_has_EXT_depth_bounds_test(ctx))
goto invalid_enum_error;
- CHECK_EXTENSION(EXT_depth_bounds_test);
if (ctx->Depth.BoundsTest == state)
return;
FLUSH_VERTICES(ctx, ctx->DriverFlags.NewDepth ? 0 : _NEW_DEPTH);
break;
case GL_DEPTH_CLAMP_NEAR_AMD:
- if (!_mesa_is_desktop_gl(ctx))
+ if (!_mesa_has_AMD_depth_clamp_separate(ctx))
goto invalid_enum_error;
- CHECK_EXTENSION(AMD_depth_clamp_separate);
if (ctx->Transform.DepthClampNear == state)
return;
FLUSH_VERTICES(ctx, ctx->DriverFlags.NewDepthClamp ? 0 :
break;
case GL_DEPTH_CLAMP_FAR_AMD:
- if (!_mesa_is_desktop_gl(ctx))
+ if (!_mesa_has_AMD_depth_clamp_separate(ctx))
goto invalid_enum_error;
- CHECK_EXTENSION(AMD_depth_clamp_separate);
if (ctx->Transform.DepthClampFar == state)
return;
FLUSH_VERTICES(ctx, ctx->DriverFlags.NewDepthClamp ? 0 :
break;
case GL_FRAGMENT_SHADER_ATI:
- if (ctx->API != API_OPENGL_COMPAT)
- goto invalid_enum_error;
- CHECK_EXTENSION(ATI_fragment_shader);
+ if (!_mesa_has_ATI_fragment_shader(ctx))
+ goto invalid_enum_error;
if (ctx->ATIFragmentShader.Enabled == state)
return;
FLUSH_VERTICES(ctx, _NEW_PROGRAM);
break;
case GL_TEXTURE_CUBE_MAP_SEAMLESS:
- if (!_mesa_is_desktop_gl(ctx))
+ if (!_mesa_has_ARB_seamless_cube_map(ctx))
goto invalid_enum_error;
- CHECK_EXTENSION(ARB_seamless_cube_map);
if (ctx->Texture.CubeMapSeamless != state) {
FLUSH_VERTICES(ctx, _NEW_TEXTURE_OBJECT);
ctx->Texture.CubeMapSeamless = state;
break;
case GL_RASTERIZER_DISCARD:
- if (!_mesa_is_desktop_gl(ctx) && !_mesa_is_gles3(ctx))
+ if (!(_mesa_has_EXT_transform_feedback(ctx) || _mesa_is_gles3(ctx)))
goto invalid_enum_error;
- CHECK_EXTENSION(EXT_transform_feedback);
if (ctx->RasterDiscard != state) {
FLUSH_VERTICES(ctx, 0);
ctx->NewDriverState |= ctx->DriverFlags.NewRasterizerDiscard;
break;
case GL_TILE_RASTER_ORDER_FIXED_MESA:
- CHECK_EXTENSION(MESA_tile_raster_order);
+ if (!_mesa_has_MESA_tile_raster_order(ctx))
+ goto invalid_enum_error;
if (ctx->TileRasterOrderFixed != state) {
FLUSH_VERTICES(ctx, 0);
ctx->NewDriverState |= ctx->DriverFlags.NewTileRasterOrder;
break;
case GL_TILE_RASTER_ORDER_INCREASING_X_MESA:
- CHECK_EXTENSION(MESA_tile_raster_order);
+ if (!_mesa_has_MESA_tile_raster_order(ctx))
+ goto invalid_enum_error;
if (ctx->TileRasterOrderIncreasingX != state) {
FLUSH_VERTICES(ctx, 0);
ctx->NewDriverState |= ctx->DriverFlags.NewTileRasterOrder;
break;
case GL_TILE_RASTER_ORDER_INCREASING_Y_MESA:
- CHECK_EXTENSION(MESA_tile_raster_order);
+ if (!_mesa_has_MESA_tile_raster_order(ctx))
+ goto invalid_enum_error;
if (ctx->TileRasterOrderIncreasingY != state) {
FLUSH_VERTICES(ctx, 0);
ctx->NewDriverState |= ctx->DriverFlags.NewTileRasterOrder;
if (ctx->Array.PrimitiveRestart != state) {
FLUSH_VERTICES(ctx, 0);
ctx->Array.PrimitiveRestart = state;
- update_derived_primitive_restart_state(ctx);
+ _mesa_update_derived_primitive_restart_state(ctx);
}
break;
case GL_PRIMITIVE_RESTART_FIXED_INDEX:
- if (!_mesa_is_gles3(ctx) && !ctx->Extensions.ARB_ES3_compatibility)
+ if (!_mesa_is_gles3(ctx) && !_mesa_has_ARB_ES3_compatibility(ctx))
goto invalid_enum_error;
if (ctx->Array.PrimitiveRestartFixedIndex != state) {
FLUSH_VERTICES(ctx, 0);
ctx->Array.PrimitiveRestartFixedIndex = state;
- update_derived_primitive_restart_state(ctx);
+ _mesa_update_derived_primitive_restart_state(ctx);
}
break;
/* GL3.0 - GL_framebuffer_sRGB */
case GL_FRAMEBUFFER_SRGB_EXT:
- CHECK_EXTENSION(EXT_framebuffer_sRGB);
+ if (!_mesa_has_EXT_framebuffer_sRGB(ctx) &&
+ !_mesa_has_EXT_sRGB_write_control(ctx))
+ goto invalid_enum_error;
_mesa_set_framebuffer_srgb(ctx, state);
return;
/* GL_OES_EGL_image_external */
case GL_TEXTURE_EXTERNAL_OES:
- if (!_mesa_is_gles(ctx))
+ if (!_mesa_has_OES_EGL_image_external(ctx))
goto invalid_enum_error;
- CHECK_EXTENSION(OES_EGL_image_external);
if (!enable_texture(ctx, state, TEXTURE_EXTERNAL_BIT)) {
return;
}
/* ARB_texture_multisample */
case GL_SAMPLE_MASK:
- if (!_mesa_is_desktop_gl(ctx) && !_mesa_is_gles31(ctx))
+ if (!_mesa_has_ARB_texture_multisample(ctx) && !_mesa_is_gles31(ctx))
goto invalid_enum_error;
- CHECK_EXTENSION(ARB_texture_multisample);
if (ctx->Multisample.SampleMask == state)
return;
FLUSH_VERTICES(ctx, ctx->DriverFlags.NewSampleMask ? 0 :
break;
case GL_BLEND_ADVANCED_COHERENT_KHR:
- CHECK_EXTENSION(KHR_blend_equation_advanced_coherent);
+ if (!_mesa_has_KHR_blend_equation_advanced_coherent(ctx))
+ goto invalid_enum_error;
if (ctx->Color.BlendCoherent == state)
return;
FLUSH_VERTICES(ctx, ctx->DriverFlags.NewBlend ? 0 : _NEW_COLOR);
ctx->Color.BlendCoherent = state;
break;
+ case GL_BLACKHOLE_RENDER_INTEL:
+ if (!_mesa_has_INTEL_blackhole_render(ctx))
+ goto invalid_enum_error;
+ if (ctx->IntelBlackholeRender == state)
+ return;
+ FLUSH_VERTICES(ctx, 0);
+ ctx->IntelBlackholeRender = state;
+ break;
+
default:
goto invalid_enum_error;
}
_mesa_flush_vertices_for_blend_adv(ctx, enabled,
ctx->Color._AdvancedBlendMode);
ctx->Color.BlendEnabled = enabled;
+ _mesa_update_allow_draw_out_of_order(ctx);
}
break;
case GL_SCISSOR_TEST:
ctx->Scissor.EnableFlags &= ~(1 << index);
}
break;
+ /* EXT_direct_state_access */
+ case GL_TEXTURE_1D:
+ case GL_TEXTURE_2D:
+ case GL_TEXTURE_3D:
+ case GL_TEXTURE_CUBE_MAP:
+ case GL_TEXTURE_GEN_S:
+ case GL_TEXTURE_GEN_T:
+ case GL_TEXTURE_GEN_R:
+ case GL_TEXTURE_GEN_Q:
+ case GL_TEXTURE_RECTANGLE_ARB: {
+ const GLuint curTexUnitSave = ctx->Texture.CurrentUnit;
+ if (index >= MAX2(ctx->Const.MaxCombinedTextureImageUnits,
+ ctx->Const.MaxTextureCoordUnits)) {
+ _mesa_error(ctx, GL_INVALID_VALUE, "%s(index=%u)",
+ state ? "glEnablei" : "glDisablei", index);
+ return;
+ }
+ _mesa_ActiveTexture(GL_TEXTURE0 + index);
+ _mesa_set_enable( ctx, cap, state );
+ _mesa_ActiveTexture(GL_TEXTURE0 + curTexUnitSave);
+ break;
+ }
default:
goto invalid_enum_error;
}
return GL_FALSE;
}
return (ctx->Scissor.EnableFlags >> index) & 1;
+ /* EXT_direct_state_access */
+ case GL_TEXTURE_1D:
+ case GL_TEXTURE_2D:
+ case GL_TEXTURE_3D:
+ case GL_TEXTURE_CUBE_MAP:
+ case GL_TEXTURE_GEN_S:
+ case GL_TEXTURE_GEN_T:
+ case GL_TEXTURE_GEN_R:
+ case GL_TEXTURE_GEN_Q:
+ case GL_TEXTURE_RECTANGLE_ARB: {
+ GLboolean state;
+ const GLuint curTexUnitSave = ctx->Texture.CurrentUnit;
+ if (index >= MAX2(ctx->Const.MaxCombinedTextureImageUnits,
+ ctx->Const.MaxTextureCoordUnits)) {
+ _mesa_error(ctx, GL_INVALID_VALUE, "glIsEnabledIndexed(index=%u)",
+ index);
+ return GL_FALSE;
+ }
+ _mesa_ActiveTexture(GL_TEXTURE0 + index);
+ state = _mesa_IsEnabled(cap);
+ _mesa_ActiveTexture(GL_TEXTURE0 + curTexUnitSave);
+ return state;
+ }
default:
_mesa_error(ctx, GL_INVALID_ENUM, "glIsEnabledIndexed(cap=%s)",
_mesa_enum_to_string(cap));
is_texture_enabled(struct gl_context *ctx, GLbitfield bit)
{
const struct gl_fixedfunc_texture_unit *const texUnit =
- _mesa_get_current_fixedfunc_tex_unit(ctx);
+ _mesa_get_fixedfunc_tex_unit(ctx, ctx->Texture.CurrentUnit);
if (!texUnit)
return GL_FALSE;
/* GL_NV_point_sprite */
case GL_POINT_SPRITE_NV:
- if (ctx->API != API_OPENGL_COMPAT && ctx->API != API_OPENGLES)
+ if (!(ctx->API == API_OPENGL_COMPAT &&
+ (_mesa_has_ARB_point_sprite(ctx) ||
+ _mesa_has_NV_point_sprite(ctx))) &&
+ !_mesa_has_OES_point_sprite(ctx))
goto invalid_enum_error;
- CHECK_EXTENSION2(NV_point_sprite, ARB_point_sprite)
return ctx->Point.PointSprite;
case GL_VERTEX_PROGRAM_ARB:
- if (ctx->API != API_OPENGL_COMPAT)
+ if (!_mesa_has_ARB_vertex_program(ctx))
goto invalid_enum_error;
- CHECK_EXTENSION(ARB_vertex_program);
return ctx->VertexProgram.Enabled;
case GL_VERTEX_PROGRAM_POINT_SIZE_ARB:
/* This was added with ARB_vertex_program, but it is also used with
* GLSL vertex shaders on desktop.
*/
- if (!_mesa_is_desktop_gl(ctx))
+ if (!_mesa_has_ARB_vertex_program(ctx) &&
+ ctx->API != API_OPENGL_CORE)
goto invalid_enum_error;
- CHECK_EXTENSION(ARB_vertex_program);
return ctx->VertexProgram.PointSizeEnabled;
case GL_VERTEX_PROGRAM_TWO_SIDE_ARB:
- if (ctx->API != API_OPENGL_COMPAT)
+ if (!_mesa_has_ARB_vertex_program(ctx))
goto invalid_enum_error;
- CHECK_EXTENSION(ARB_vertex_program);
return ctx->VertexProgram.TwoSideEnabled;
/* GL_NV_texture_rectangle */
case GL_TEXTURE_RECTANGLE_NV:
- if (ctx->API != API_OPENGL_COMPAT)
+ if (!_mesa_has_NV_texture_rectangle(ctx))
goto invalid_enum_error;
- CHECK_EXTENSION(NV_texture_rectangle);
return is_texture_enabled(ctx, TEXTURE_RECT_BIT);
/* GL_EXT_stencil_two_side */
case GL_STENCIL_TEST_TWO_SIDE_EXT:
- if (ctx->API != API_OPENGL_COMPAT)
+ if (!_mesa_has_EXT_stencil_two_side(ctx))
goto invalid_enum_error;
- CHECK_EXTENSION(EXT_stencil_two_side);
return ctx->Stencil.TestTwoSide;
case GL_FRAGMENT_PROGRAM_ARB:
/* GL_EXT_depth_bounds_test */
case GL_DEPTH_BOUNDS_TEST_EXT:
- if (!_mesa_is_desktop_gl(ctx))
+ if (!_mesa_has_EXT_depth_bounds_test(ctx))
goto invalid_enum_error;
- CHECK_EXTENSION(EXT_depth_bounds_test);
return ctx->Depth.BoundsTest;
/* GL_ARB_depth_clamp */
ctx->Transform.DepthClampFar;
case GL_DEPTH_CLAMP_NEAR_AMD:
- if (!_mesa_is_desktop_gl(ctx))
+ if (!_mesa_has_AMD_depth_clamp_separate(ctx))
goto invalid_enum_error;
- CHECK_EXTENSION(AMD_depth_clamp_separate);
return ctx->Transform.DepthClampNear;
case GL_DEPTH_CLAMP_FAR_AMD:
- if (!_mesa_is_desktop_gl(ctx))
+ if (!_mesa_has_AMD_depth_clamp_separate(ctx))
goto invalid_enum_error;
- CHECK_EXTENSION(AMD_depth_clamp_separate);
return ctx->Transform.DepthClampFar;
case GL_FRAGMENT_SHADER_ATI:
- if (ctx->API != API_OPENGL_COMPAT)
+ if (!_mesa_has_ATI_fragment_shader(ctx))
goto invalid_enum_error;
- CHECK_EXTENSION(ATI_fragment_shader);
return ctx->ATIFragmentShader.Enabled;
case GL_TEXTURE_CUBE_MAP_SEAMLESS:
- if (!_mesa_is_desktop_gl(ctx))
+ if (!_mesa_has_ARB_seamless_cube_map(ctx))
goto invalid_enum_error;
- CHECK_EXTENSION(ARB_seamless_cube_map);
return ctx->Texture.CubeMapSeamless;
case GL_RASTERIZER_DISCARD:
- if (!_mesa_is_desktop_gl(ctx) && !_mesa_is_gles3(ctx))
+ if (!(_mesa_has_EXT_transform_feedback(ctx) || _mesa_is_gles3(ctx)))
goto invalid_enum_error;
- CHECK_EXTENSION(EXT_transform_feedback);
return ctx->RasterDiscard;
/* GL_NV_primitive_restart */
case GL_PRIMITIVE_RESTART_NV:
- if (ctx->API != API_OPENGL_COMPAT || !ctx->Extensions.NV_primitive_restart) {
+ if (!_mesa_has_NV_primitive_restart(ctx))
goto invalid_enum_error;
- }
return ctx->Array.PrimitiveRestart;
/* GL 3.1 primitive restart */
return ctx->Array.PrimitiveRestart;
case GL_PRIMITIVE_RESTART_FIXED_INDEX:
- if (!_mesa_is_gles3(ctx) && !ctx->Extensions.ARB_ES3_compatibility) {
+ if (!_mesa_is_gles3(ctx) && !_mesa_has_ARB_ES3_compatibility(ctx))
goto invalid_enum_error;
- }
return ctx->Array.PrimitiveRestartFixedIndex;
/* GL3.0 - GL_framebuffer_sRGB */
case GL_FRAMEBUFFER_SRGB_EXT:
- CHECK_EXTENSION(EXT_framebuffer_sRGB);
+ if (!_mesa_has_EXT_framebuffer_sRGB(ctx) &&
+ !_mesa_has_EXT_sRGB_write_control(ctx))
+ goto invalid_enum_error;
return ctx->Color.sRGBEnabled;
/* GL_OES_EGL_image_external */
case GL_TEXTURE_EXTERNAL_OES:
- if (!_mesa_is_gles(ctx))
+ if (!_mesa_has_OES_EGL_image_external(ctx))
goto invalid_enum_error;
- CHECK_EXTENSION(OES_EGL_image_external);
return is_texture_enabled(ctx, TEXTURE_EXTERNAL_BIT);
/* ARB_texture_multisample */
case GL_SAMPLE_MASK:
- if (!_mesa_is_desktop_gl(ctx) && !_mesa_is_gles31(ctx))
+ if (!_mesa_has_ARB_texture_multisample(ctx) && !_mesa_is_gles31(ctx))
goto invalid_enum_error;
- CHECK_EXTENSION(ARB_texture_multisample);
return ctx->Multisample.SampleMask;
/* ARB_sample_shading */
case GL_SAMPLE_SHADING:
- if (!_mesa_is_desktop_gl(ctx) && !_mesa_is_gles3(ctx))
+ if (!_mesa_has_ARB_sample_shading(ctx) && !_mesa_is_gles3(ctx))
goto invalid_enum_error;
- CHECK_EXTENSION(ARB_sample_shading);
return ctx->Multisample.SampleShading;
case GL_BLEND_ADVANCED_COHERENT_KHR:
- CHECK_EXTENSION(KHR_blend_equation_advanced_coherent);
+ if (!_mesa_has_KHR_blend_equation_advanced_coherent(ctx))
+ goto invalid_enum_error;
return ctx->Color.BlendCoherent;
case GL_CONSERVATIVE_RASTERIZATION_INTEL:
return ctx->IntelConservativeRasterization;
case GL_CONSERVATIVE_RASTERIZATION_NV:
- CHECK_EXTENSION(NV_conservative_raster);
+ if (!_mesa_has_NV_conservative_raster(ctx))
+ goto invalid_enum_error;
return ctx->ConservativeRasterization;
case GL_TILE_RASTER_ORDER_FIXED_MESA:
- CHECK_EXTENSION(MESA_tile_raster_order);
+ if (!_mesa_has_MESA_tile_raster_order(ctx))
+ goto invalid_enum_error;
return ctx->TileRasterOrderFixed;
case GL_TILE_RASTER_ORDER_INCREASING_X_MESA:
- CHECK_EXTENSION(MESA_tile_raster_order);
+ if (!_mesa_has_MESA_tile_raster_order(ctx))
+ goto invalid_enum_error;
return ctx->TileRasterOrderIncreasingX;
case GL_TILE_RASTER_ORDER_INCREASING_Y_MESA:
- CHECK_EXTENSION(MESA_tile_raster_order);
+ if (!_mesa_has_MESA_tile_raster_order(ctx))
+ goto invalid_enum_error;
return ctx->TileRasterOrderIncreasingY;
+ case GL_BLACKHOLE_RENDER_INTEL:
+ if (!_mesa_has_INTEL_blackhole_render(ctx))
+ goto invalid_enum_error;
+ return ctx->IntelBlackholeRender;
+
default:
goto invalid_enum_error;
}
projects / mesa.git / blobdiff