glthread: track primitive restart state

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

diff --git a/src/mesa/main/texobj.h b/src/mesa/main/texobj.h
index 4971a2075d80535310018dc7731a1844d6759cce..be8c6e4e6c2ceb4bc8efe1baef2313e05717e589 100644 (file)
--- a/src/mesa/main/texobj.h
+++ b/src/mesa/main/texobj.h
@@ -32,9 +32,7 @@
 #define TEXTOBJ_H
 
 
-#include "compiler.h"
 #include "glheader.h"
-#include "mtypes.h"
 #include "samplerobj.h"
 
 
@@ -60,6 +58,12 @@ _mesa_lookup_texture_locked(struct gl_context *ctx, GLuint id);
 extern struct gl_texture_object *
 _mesa_get_current_tex_object(struct gl_context *ctx, GLenum target);
 
+extern struct gl_texture_object *
+_mesa_get_texobj_by_target_and_texunit(struct gl_context *ctx, GLenum target,
+                                       GLuint texunit,
+                                       bool allowProxyTargets,
+                                       const char* caller);
+
 extern struct gl_texture_object *
 _mesa_new_texture_object( struct gl_context *ctx, GLuint name, GLenum target );
 
@@ -81,7 +85,8 @@ _mesa_copy_texture_object( struct gl_texture_object *dest,
 
 extern void
 _mesa_clear_texture_object(struct gl_context *ctx,
-                           struct gl_texture_object *obj);
+                           struct gl_texture_object *obj,
+                           struct gl_texture_image *retainTexImage);
 
 extern void
 _mesa_reference_texobj_(struct gl_texture_object **ptr,
@@ -119,14 +124,28 @@ static inline GLboolean
 _mesa_is_texture_complete(const struct gl_texture_object *texObj,
                           const struct gl_sampler_object *sampler)
 {
+   struct gl_texture_image *img = texObj->Image[0][texObj->BaseLevel];
+   bool isMultisample = img && img->NumSamples >= 2;
+
    /*
     * According to ARB_stencil_texturing, NEAREST_MIPMAP_NEAREST would
     * be forbidden, however it is allowed per GL 4.5 rules, allow it
     * even without GL 4.5 since it was a spec mistake.
     */
-   if ((texObj->_IsIntegerFormat ||
+   /* Section 8.17 (texture completeness) of the OpenGL 4.6 core profile spec:
+    *
+    *  "The texture is not multisample; either the magnification filter is not
+    *  NEAREST, or the minification filter is neither NEAREST nor NEAREST_-
+    *  MIPMAP_NEAREST; and any of
+    *  – The internal format of the texture is integer.
+    *  – The internal format is STENCIL_INDEX.
+    *  – The internal format is DEPTH_STENCIL, and the value of DEPTH_-
+    *    STENCIL_TEXTURE_MODE for the texture is STENCIL_INDEX.""
+    */
+   if (!isMultisample &&
+       (texObj->_IsIntegerFormat ||
         (texObj->StencilSampling &&
-         texObj->Image[0][texObj->BaseLevel]->_BaseFormat == GL_DEPTH_STENCIL)) &&
+         img->_BaseFormat == GL_DEPTH_STENCIL)) &&
        (sampler->MagFilter != GL_NEAREST ||
         (sampler->MinFilter != GL_NEAREST &&
          sampler->MinFilter != GL_NEAREST_MIPMAP_NEAREST))) {
@@ -134,7 +153,12 @@ _mesa_is_texture_complete(const struct gl_texture_object *texObj,
       return GL_FALSE;
    }
 
-   if (_mesa_is_mipmap_filter(sampler))
+   /* Section 8.17 (texture completeness) of the OpenGL 4.6 core profile spec:
+    *
+    *  "The minification filter requires a mipmap (is neither NEAREST nor LINEAR),
+    *  the texture is not multisample, and the texture is not mipmap complete.""
+    */
+   if (!isMultisample &&_mesa_is_mipmap_filter(sampler))
       return texObj->_MipmapComplete;
    else
       return texObj->_BaseComplete;
@@ -170,6 +194,19 @@ _mesa_unlock_context_textures( struct gl_context *ctx );
 extern void
 _mesa_lock_context_textures( struct gl_context *ctx );
 
+extern void
+_mesa_delete_nameless_texture(struct gl_context *ctx,
+                              struct gl_texture_object *texObj);
+
+extern void
+_mesa_bind_texture(struct gl_context *ctx, GLenum target,
+                   struct gl_texture_object *tex_obj);
+
+extern struct gl_texture_object *
+_mesa_lookup_or_create_texture(struct gl_context *ctx, GLenum target,
+                               GLuint texName, bool no_error, bool is_ext_dsa,
+                               const char *name);
+
 /*@}*/
 
 /**
@@ -189,6 +226,9 @@ _mesa_CreateTextures_no_error(GLenum target, GLsizei n, GLuint *textures);
 extern void GLAPIENTRY
 _mesa_CreateTextures(GLenum target, GLsizei n, GLuint *textures);
 
+void GLAPIENTRY
+_mesa_DeleteTextures_no_error(GLsizei n, const GLuint *textures);
+
 extern void GLAPIENTRY
 _mesa_DeleteTextures( GLsizei n, const GLuint *textures );
 
@@ -199,12 +239,19 @@ _mesa_BindTexture_no_error(GLenum target, GLuint texture);
 extern void GLAPIENTRY
 _mesa_BindTexture( GLenum target, GLuint texture );
 
+void GLAPIENTRY
+_mesa_BindMultiTextureEXT(GLenum texunit, GLenum target, GLuint texture);
+
 void GLAPIENTRY
 _mesa_BindTextureUnit_no_error(GLuint unit, GLuint texture);
 
 extern void GLAPIENTRY
 _mesa_BindTextureUnit(GLuint unit, GLuint texture);
 
+void GLAPIENTRY
+_mesa_BindTextures_no_error(GLuint first, GLsizei count,
+                            const GLuint *textures);
+
 extern void GLAPIENTRY
 _mesa_BindTextures( GLuint first, GLsizei count, const GLuint *textures );