return true;
case GL_TEXTURE_2D_ARRAY:
return ctx->Extensions.EXT_texture_array;
+ case GL_TEXTURE_CUBE_MAP_ARRAY:
+ return _mesa_has_texture_cube_map_array(ctx);
}
break;
}
return true;
case GL_PROXY_TEXTURE_2D_ARRAY:
return ctx->Extensions.EXT_texture_array;
- case GL_TEXTURE_CUBE_MAP_ARRAY:
case GL_PROXY_TEXTURE_CUBE_MAP_ARRAY:
return ctx->Extensions.ARB_texture_cube_map_array;
default:
static GLboolean
tex_storage_error_check(struct gl_context *ctx,
struct gl_texture_object *texObj,
+ struct gl_memory_object *memObj,
GLuint dims, GLenum target,
GLsizei levels, GLenum internalformat,
GLsizei width, GLsizei height, GLsizei depth,
bool dsa)
{
- const char* suffix = dsa ? "ture" : "";
+ const char* suffix = dsa ? (memObj ? "tureMem" : "ture") :
+ (memObj ? "Mem" : "");
/* Legal format checking has been moved to texstorage and texturestorage in
* order to allow meta functions to use legacy formats. */
* Helper that does the storage allocation for _mesa_TexStorage1/2/3D()
* and _mesa_TextureStorage1/2/3D().
*/
-void
-_mesa_texture_storage(struct gl_context *ctx, GLuint dims,
- struct gl_texture_object *texObj,
- GLenum target, GLsizei levels,
- GLenum internalformat, GLsizei width,
- GLsizei height, GLsizei depth, bool dsa)
+static ALWAYS_INLINE void
+texture_storage(struct gl_context *ctx, GLuint dims,
+ struct gl_texture_object *texObj,
+ struct gl_memory_object *memObj, GLenum target,
+ GLsizei levels, GLenum internalformat, GLsizei width,
+ GLsizei height, GLsizei depth, GLuint64 offset, bool dsa,
+ bool no_error)
{
- GLboolean sizeOK, dimensionsOK;
+ GLboolean sizeOK = GL_TRUE, dimensionsOK = GL_TRUE;
mesa_format texFormat;
- const char* suffix = dsa ? "ture" : "";
+ const char* suffix = dsa ? (memObj ? "tureMem" : "ture") :
+ (memObj ? "Mem" : "");
assert(texObj);
- if (tex_storage_error_check(ctx, texObj, dims, target, levels,
- internalformat, width, height, depth, dsa)) {
- return; /* error was recorded */
+ if (!no_error) {
+ if (tex_storage_error_check(ctx, texObj, memObj, dims, target, levels,
+ internalformat, width, height, depth, dsa)) {
+ return; /* error was recorded */
+ }
}
texFormat = _mesa_choose_texture_format(ctx, texObj, target, 0,
internalformat, GL_NONE, GL_NONE);
- assert(texFormat != MESA_FORMAT_NONE);
- /* check that width, height, depth are legal for the mipmap level */
- dimensionsOK = _mesa_legal_texture_dimensions(ctx, target, 0,
- width, height, depth, 0);
+ if (!no_error) {
+ /* check that width, height, depth are legal for the mipmap level */
+ dimensionsOK = _mesa_legal_texture_dimensions(ctx, target, 0,
+ width, height, depth, 0);
- sizeOK = ctx->Driver.TestProxyTexImage(ctx, target, levels, 0, texFormat,
- 1, width, height, depth);
+ sizeOK = ctx->Driver.TestProxyTexImage(ctx, target, levels, 0, texFormat,
+ 1, width, height, depth);
+ }
if (_mesa_is_proxy_texture(target)) {
if (dimensionsOK && sizeOK) {
}
}
else {
- if (!dimensionsOK) {
- _mesa_error(ctx, GL_INVALID_VALUE,
- "glTex%sStorage%uD(invalid width, height or depth)",
- suffix, dims);
- return;
- }
+ if (!no_error) {
+ if (!dimensionsOK) {
+ _mesa_error(ctx, GL_INVALID_VALUE,
+ "glTex%sStorage%uD(invalid width, height or depth)",
+ suffix, dims);
+ return;
+ }
- if (!sizeOK) {
- _mesa_error(ctx, GL_OUT_OF_MEMORY,
- "glTex%sStorage%uD(texture too large)",
- suffix, dims);
+ if (!sizeOK) {
+ _mesa_error(ctx, GL_OUT_OF_MEMORY,
+ "glTex%sStorage%uD(texture too large)",
+ suffix, dims);
+ return;
+ }
}
assert(levels > 0);
return;
}
- /* Do actual texture memory allocation */
- if (!ctx->Driver.AllocTextureStorage(ctx, texObj, levels,
- width, height, depth)) {
- /* Reset the texture images' info to zeros.
- * Strictly speaking, we probably don't have to do this since
- * generating GL_OUT_OF_MEMORY can leave things in an undefined
- * state but this puts things in a consistent state.
- */
- clear_texture_fields(ctx, texObj);
- _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTex%sStorage%uD",
- suffix, dims);
- return;
+ /* Setup the backing memory */
+ if (memObj) {
+ if (!ctx->Driver.SetTextureStorageForMemoryObject(ctx, texObj, memObj,
+ levels,
+ width, height, depth,
+ offset)) {
+
+ clear_texture_fields(ctx, texObj);
+ return;
+ }
+ }
+ else {
+ if (!ctx->Driver.AllocTextureStorage(ctx, texObj, levels,
+ width, height, depth)) {
+ /* Reset the texture images' info to zeros.
+ * Strictly speaking, we probably don't have to do this since
+ * generating GL_OUT_OF_MEMORY can leave things in an undefined
+ * state but this puts things in a consistent state.
+ */
+ clear_texture_fields(ctx, texObj);
+ _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTex%sStorage%uD",
+ suffix, dims);
+ return;
+ }
}
_mesa_set_texture_view_state(ctx, texObj, target, levels);
}
+static void
+texture_storage_error(struct gl_context *ctx, GLuint dims,
+ struct gl_texture_object *texObj,
+ GLenum target, GLsizei levels,
+ GLenum internalformat, GLsizei width,
+ GLsizei height, GLsizei depth, bool dsa)
+{
+ texture_storage(ctx, dims, texObj, NULL, target, levels, internalformat,
+ width, height, depth, dsa, 0, false);
+}
+
+
+static void
+texture_storage_no_error(struct gl_context *ctx, GLuint dims,
+ struct gl_texture_object *texObj,
+ GLenum target, GLsizei levels,
+ GLenum internalformat, GLsizei width,
+ GLsizei height, GLsizei depth, bool dsa)
+{
+ texture_storage(ctx, dims, texObj, NULL, target, levels, internalformat,
+ width, height, depth, dsa, 0, true);
+}
+
+
/**
* Helper used by _mesa_TexStorage1/2/3D().
*/
static void
-texstorage(GLuint dims, GLenum target, GLsizei levels, GLenum internalformat,
- GLsizei width, GLsizei height, GLsizei depth)
+texstorage_error(GLuint dims, GLenum target, GLsizei levels,
+ GLenum internalformat, GLsizei width, GLsizei height,
+ GLsizei depth, const char *caller)
{
struct gl_texture_object *texObj;
GET_CURRENT_CONTEXT(ctx);
- /* Check target. This is done here so that _mesa_texture_storage
+ /* Check target. This is done here so that texture_storage
* can receive unsized formats.
*/
if (!legal_texobj_target(ctx, dims, target)) {
_mesa_error(ctx, GL_INVALID_ENUM,
- "glTexStorage%uD(illegal target=%s)",
- dims, _mesa_enum_to_string(target));
+ "%s(illegal target=%s)",
+ caller, _mesa_enum_to_string(target));
return;
}
if (MESA_VERBOSE & (VERBOSE_API|VERBOSE_TEXTURE))
- _mesa_debug(ctx, "glTexStorage%uD %s %d %s %d %d %d\n",
- dims,
+ _mesa_debug(ctx, "%s %s %d %s %d %d %d\n", caller,
_mesa_enum_to_string(target), levels,
_mesa_enum_to_string(internalformat),
width, height, depth);
/* Check the format to make sure it is sized. */
if (!_mesa_is_legal_tex_storage_format(ctx, internalformat)) {
_mesa_error(ctx, GL_INVALID_ENUM,
- "glTexStorage%uD(internalformat = %s)", dims,
+ "%s(internalformat = %s)", caller,
_mesa_enum_to_string(internalformat));
return;
}
if (!texObj)
return;
- _mesa_texture_storage(ctx, dims, texObj, target, levels,
+ texture_storage_error(ctx, dims, texObj, target, levels,
internalformat, width, height, depth, false);
}
+static void
+texstorage_no_error(GLuint dims, GLenum target, GLsizei levels,
+ GLenum internalformat, GLsizei width, GLsizei height,
+ GLsizei depth)
+{
+ GET_CURRENT_CONTEXT(ctx);
+
+ struct gl_texture_object *texObj = _mesa_get_current_tex_object(ctx, target);
+ texture_storage_no_error(ctx, dims, texObj, target, levels,
+ internalformat, width, height, depth, false);
+}
+
+
/**
* Helper used by _mesa_TextureStorage1/2/3D().
*/
static void
-texturestorage(GLuint dims, GLuint texture, GLsizei levels,
- GLenum internalformat, GLsizei width, GLsizei height,
- GLsizei depth)
+texturestorage_error(GLuint dims, GLuint texture, GLsizei levels,
+ GLenum internalformat, GLsizei width, GLsizei height,
+ GLsizei depth, const char *caller)
{
struct gl_texture_object *texObj;
GET_CURRENT_CONTEXT(ctx);
if (MESA_VERBOSE & (VERBOSE_API|VERBOSE_TEXTURE))
- _mesa_debug(ctx, "glTextureStorage%uD %d %d %s %d %d %d\n",
- dims, texture, levels,
+ _mesa_debug(ctx, "%s %d %d %s %d %d %d\n",
+ caller, texture, levels,
_mesa_enum_to_string(internalformat),
width, height, depth);
/* Check the format to make sure it is sized. */
if (!_mesa_is_legal_tex_storage_format(ctx, internalformat)) {
_mesa_error(ctx, GL_INVALID_ENUM,
- "glTextureStorage%uD(internalformat = %s)", dims,
+ "%s(internalformat = %s)", caller,
_mesa_enum_to_string(internalformat));
return;
}
- /* Get the texture object by Name. */
- texObj = _mesa_lookup_texture(ctx, texture);
- if (!texObj) {
- _mesa_error(ctx, GL_INVALID_OPERATION,
- "glTextureStorage%uD(texture = %d)", dims, texture);
+ texObj = _mesa_lookup_texture_err(ctx, texture, caller);
+ if (!texObj)
return;
- }
- /* Check target. This is done here so that _mesa_texture_storage
+ /* Check target. This is done here so that texture_storage
* can receive unsized formats.
*/
if (!legal_texobj_target(ctx, dims, texObj->Target)) {
- _mesa_error(ctx, GL_INVALID_ENUM,
- "glTextureStorage%uD(illegal target=%s)",
- dims, _mesa_enum_to_string(texObj->Target));
+ _mesa_error(ctx, GL_INVALID_OPERATION,
+ "%s(illegal target=%s)", caller,
+ _mesa_enum_to_string(texObj->Target));
return;
}
- _mesa_texture_storage(ctx, dims, texObj, texObj->Target,
+ texture_storage_error(ctx, dims, texObj, texObj->Target,
levels, internalformat, width, height, depth, true);
}
+static void
+texturestorage_no_error(GLuint dims, GLuint texture, GLsizei levels,
+ GLenum internalformat, GLsizei width, GLsizei height,
+ GLsizei depth)
+{
+ GET_CURRENT_CONTEXT(ctx);
+
+ struct gl_texture_object *texObj = _mesa_lookup_texture(ctx, texture);
+ texture_storage_no_error(ctx, dims, texObj, texObj->Target,
+ levels, internalformat, width, height, depth, true);
+}
+
+
+void GLAPIENTRY
+_mesa_TexStorage1D_no_error(GLenum target, GLsizei levels,
+ GLenum internalformat, GLsizei width)
+{
+ texstorage_no_error(1, target, levels, internalformat, width, 1, 1);
+}
+
+
void GLAPIENTRY
_mesa_TexStorage1D(GLenum target, GLsizei levels, GLenum internalformat,
GLsizei width)
{
- texstorage(1, target, levels, internalformat, width, 1, 1);
+ texstorage_error(1, target, levels, internalformat, width, 1, 1,
+ "glTexStorage1D");
+}
+
+
+void GLAPIENTRY
+_mesa_TexStorage2D_no_error(GLenum target, GLsizei levels,
+ GLenum internalformat, GLsizei width,
+ GLsizei height)
+{
+ texstorage_no_error(2, target, levels, internalformat, width, height, 1);
}
_mesa_TexStorage2D(GLenum target, GLsizei levels, GLenum internalformat,
GLsizei width, GLsizei height)
{
- texstorage(2, target, levels, internalformat, width, height, 1);
+ texstorage_error(2, target, levels, internalformat, width, height, 1,
+ "glTexStorage2D");
+}
+
+
+void GLAPIENTRY
+_mesa_TexStorage3D_no_error(GLenum target, GLsizei levels,
+ GLenum internalformat, GLsizei width,
+ GLsizei height, GLsizei depth)
+{
+ texstorage_no_error(3, target, levels, internalformat, width, height, depth);
}
_mesa_TexStorage3D(GLenum target, GLsizei levels, GLenum internalformat,
GLsizei width, GLsizei height, GLsizei depth)
{
- texstorage(3, target, levels, internalformat, width, height, depth);
+ texstorage_error(3, target, levels, internalformat, width, height, depth,
+ "glTexStorage3D");
+}
+
+
+void GLAPIENTRY
+_mesa_TextureStorage1D_no_error(GLuint texture, GLsizei levels,
+ GLenum internalformat, GLsizei width)
+{
+ texturestorage_no_error(1, texture, levels, internalformat, width, 1, 1);
}
_mesa_TextureStorage1D(GLuint texture, GLsizei levels, GLenum internalformat,
GLsizei width)
{
- texturestorage(1, texture, levels, internalformat, width, 1, 1);
+ texturestorage_error(1, texture, levels, internalformat, width, 1, 1,
+ "glTextureStorage1D");
+}
+
+
+void GLAPIENTRY
+_mesa_TextureStorage2D_no_error(GLuint texture, GLsizei levels,
+ GLenum internalformat,
+ GLsizei width, GLsizei height)
+{
+ texturestorage_no_error(2, texture, levels, internalformat, width, height, 1);
}
GLenum internalformat,
GLsizei width, GLsizei height)
{
- texturestorage(2, texture, levels, internalformat, width, height, 1);
+ texturestorage_error(2, texture, levels, internalformat, width, height, 1,
+ "glTextureStorage2D");
}
void GLAPIENTRY
-_mesa_TextureStorage3D(GLuint texture, GLsizei levels, GLenum internalformat,
- GLsizei width, GLsizei height, GLsizei depth)
+_mesa_TextureStorage3D_no_error(GLuint texture, GLsizei levels,
+ GLenum internalformat, GLsizei width,
+ GLsizei height, GLsizei depth)
{
- texturestorage(3, texture, levels, internalformat, width, height, depth);
+ texturestorage_no_error(3, texture, levels, internalformat, width, height,
+ depth);
}
-/*
- * Note: we don't support GL_EXT_direct_state_access and the spec says
- * we don't need the following functions. However, glew checks for the
- * presence of all six functions and will say that GL_ARB_texture_storage
- * is not supported if these functions are missing.
- */
+void GLAPIENTRY
+_mesa_TextureStorage3D(GLuint texture, GLsizei levels, GLenum internalformat,
+ GLsizei width, GLsizei height, GLsizei depth)
+{
+ texturestorage_error(3, texture, levels, internalformat, width, height, depth,
+ "glTextureStorage3D");
+}
void GLAPIENTRY
GLsizei width)
{
GET_CURRENT_CONTEXT(ctx);
-
- (void) texture;
- (void) target;
- (void) levels;
- (void) internalformat;
- (void) width;
-
- _mesa_error(ctx, GL_INVALID_OPERATION,
- "glTextureStorage1DEXT not supported");
+ /* 'texture' must always be initialized, even if the call to
+ * glTextureStorage1DEXT will generate an error.
+ */
+ if (!_mesa_lookup_or_create_texture(ctx, target, texture, false, true,
+ "glTextureStorage1DEXT"))
+ return;
+ texturestorage_error(1, texture, levels, internalformat, width, 1, 1,
+ "glTextureStorage1DEXT");
}
GLsizei width, GLsizei height)
{
GET_CURRENT_CONTEXT(ctx);
-
- (void) texture;
- (void) target;
- (void) levels;
- (void) internalformat;
- (void) width;
- (void) height;
-
- _mesa_error(ctx, GL_INVALID_OPERATION,
- "glTextureStorage2DEXT not supported");
+ /* 'texture' must always be initialized, even if the call to
+ * glTextureStorage2DEXT will generate an error.
+ */
+ if (!_mesa_lookup_or_create_texture(ctx, target, texture, false, true,
+ "glTextureStorage2DEXT"))
+ return;
+ texturestorage_error(2, texture, levels, internalformat, width, height, 1,
+ "glTextureStorage2DEXT");
}
GLsizei width, GLsizei height, GLsizei depth)
{
GET_CURRENT_CONTEXT(ctx);
+ /* 'texture' must always be initialized, even if the call to
+ * glTextureStorage3DEXT will generate an error.
+ */
+ if (!_mesa_lookup_or_create_texture(ctx, target, texture, false, true,
+ "glTextureStorage3DEXT"))
+ return;
+ texturestorage_error(3, texture, levels, internalformat, width, height, depth,
+ "glTextureStorage3DEXT");
+}
- (void) texture;
- (void) target;
- (void) levels;
- (void) internalformat;
- (void) width;
- (void) height;
- (void) depth;
- _mesa_error(ctx, GL_INVALID_OPERATION,
- "glTextureStorage3DEXT not supported");
+void
+_mesa_texture_storage_memory(struct gl_context *ctx, GLuint dims,
+ struct gl_texture_object *texObj,
+ struct gl_memory_object *memObj,
+ GLenum target, GLsizei levels,
+ GLenum internalformat, GLsizei width,
+ GLsizei height, GLsizei depth,
+ GLuint64 offset, bool dsa)
+{
+ assert(memObj);
+
+ texture_storage(ctx, dims, texObj, memObj, target, levels, internalformat,
+ width, height, depth, offset, dsa, false);
}
projects / mesa.git / blobdiff