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 9100ae75cdc8e705f87e10b713c60fdefd1f7459..ccb54635defc47f8eb552e18202bb7c22acf7ece 100644 (file)
--- a/src/mesa/main/context.h
+++ b/src/mesa/main/context.h
@@ -152,9 +152,6 @@ _mesa_get_dispatch(struct gl_context *ctx);
 extern void
 _mesa_set_context_lost_dispatch(struct gl_context *ctx);
 
-extern GLboolean
-_mesa_valid_to_render(struct gl_context *ctx, const char *where);
-
 
 
 /** \name Miscellaneous */
@@ -317,6 +314,23 @@ _mesa_is_gles31(const struct gl_context *ctx)
 }
 
 
+/**
+ * Checks if the context is for GLES 3.2 or later
+ */
+static inline bool
+_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 ctx->Const.ContextFlags & GL_CONTEXT_FLAG_NO_ERROR_BIT_KHR;
+}
+
+
 /**
  * Checks if the context supports geometry shaders.
  */
@@ -354,7 +368,8 @@ _mesa_has_tessellation(const struct gl_context *ctx)
 static inline bool
 _mesa_has_texture_cube_map_array(const struct gl_context *ctx)
 {
-   return _mesa_is_desktop_gl(ctx) && ctx->Extensions.ARB_texture_cube_map_array;
+   return _mesa_has_ARB_texture_cube_map_array(ctx) ||
+          _mesa_has_OES_texture_cube_map_array(ctx);
 }
 
 #ifdef __cplusplus