mesa: always return GL_OUT_OF_MEMORY or GL_NO_ERROR when KHR_no_error enabled

[mesa.git] / src / mesa / main / context.h

diff --git a/src/mesa/main/context.h b/src/mesa/main/context.h
index 4798b1f9b43607a01ec0cd8004c16425a92f6ea1..ccb54635defc47f8eb552e18202bb7c22acf7ece 100644 (file)
--- a/src/mesa/main/context.h
+++ b/src/mesa/main/context.h
@@ -113,12 +113,6 @@ _mesa_initialize_context( struct gl_context *ctx,
                           struct gl_context *share_list,
                           const struct dd_function_table *driverFunctions);
 
-extern struct gl_context *
-_mesa_create_context(gl_api api,
-                     const struct gl_config *visual,
-                     struct gl_context *share_list,
-                     const struct dd_function_table *driverFunctions);
-
 extern void
 _mesa_free_context_data( struct gl_context *ctx );
 
@@ -148,9 +142,6 @@ _mesa_get_current_context(void);
 extern void
 _mesa_init_constants(struct gl_constants *consts, gl_api api);
 
-extern void
-_mesa_init_get_hash(struct gl_context *ctx);
-
 extern void
 _mesa_notifySwapBuffers(struct gl_context *gc);
 
@@ -158,9 +149,8 @@ _mesa_notifySwapBuffers(struct gl_context *gc);
 extern struct _glapi_table *
 _mesa_get_dispatch(struct gl_context *ctx);
 
-
-extern GLboolean
-_mesa_valid_to_render(struct gl_context *ctx, const char *where);
+extern void
+_mesa_set_context_lost_dispatch(struct gl_context *ctx);
 
 
 
@@ -325,34 +315,41 @@ _mesa_is_gles31(const struct gl_context *ctx)
 
 
 /**
- * Checks if the context supports geometry shaders.
+ * Checks if the context is for GLES 3.2 or later
  */
 static inline bool
-_mesa_has_geometry_shaders(const struct gl_context *ctx)
+_mesa_is_gles32(const struct gl_context *ctx)
+{
+   return ctx->API == API_OPENGLES2 && ctx->Version >= 32;
+}
+
+
+static inline bool
+_mesa_is_no_error_enabled(const struct gl_context *ctx)
 {
-   return _mesa_is_desktop_gl(ctx) &&
-      (ctx->Version >= 32 || ctx->Extensions.ARB_geometry_shader4);
+   return ctx->Const.ContextFlags & GL_CONTEXT_FLAG_NO_ERROR_BIT_KHR;
 }
 
 
 /**
- * Checks if the context supports compute shaders.
+ * Checks if the context supports geometry shaders.
  */
 static inline bool
-_mesa_has_compute_shaders(const struct gl_context *ctx)
+_mesa_has_geometry_shaders(const struct gl_context *ctx)
 {
-   return (ctx->API == API_OPENGL_CORE && ctx->Extensions.ARB_compute_shader) ||
-      (ctx->API == API_OPENGLES2 && ctx->Version >= 31);
+   return _mesa_has_OES_geometry_shader(ctx) ||
+          (_mesa_is_desktop_gl(ctx) && ctx->Version >= 32);
 }
 
+
 /**
- * Checks if the context supports shader subroutines.
+ * Checks if the context supports compute shaders.
  */
 static inline bool
-_mesa_has_shader_subroutine(const struct gl_context *ctx)
+_mesa_has_compute_shaders(const struct gl_context *ctx)
 {
-   return ctx->API == API_OPENGL_CORE &&
-      (ctx->Version >= 40 || ctx->Extensions.ARB_shader_subroutine);
+   return _mesa_has_ARB_compute_shader(ctx) ||
+      (ctx->API == API_OPENGLES2 && ctx->Version >= 31);
 }
 
 /**
@@ -361,10 +358,19 @@ _mesa_has_shader_subroutine(const struct gl_context *ctx)
 static inline GLboolean
 _mesa_has_tessellation(const struct gl_context *ctx)
 {
-   return ctx->API == API_OPENGL_CORE &&
-          ctx->Extensions.ARB_tessellation_shader;
+   /* _mesa_has_EXT_tessellation_shader(ctx) is redundant with the OES
+    * check, so don't bother calling it.
+    */
+   return _mesa_has_OES_tessellation_shader(ctx) ||
+          _mesa_has_ARB_tessellation_shader(ctx);
 }
 
+static inline bool
+_mesa_has_texture_cube_map_array(const struct gl_context *ctx)
+{
+   return _mesa_has_ARB_texture_cube_map_array(ctx) ||
+          _mesa_has_OES_texture_cube_map_array(ctx);
+}
 
 #ifdef __cplusplus
 }