* OTHER DEALINGS IN THE SOFTWARE.
*/
-
/**
* \file texstorage.c
* GL_ARB_texture_storage functions
*/
-
-
#include "glheader.h"
#include "context.h"
#include "enums.h"
#include "texstorage.h"
#include "textureview.h"
#include "mtypes.h"
-
+#include "glformats.h"
+#include "hash.h"
/**
static GLboolean
legal_texobj_target(struct gl_context *ctx, GLuint dims, GLenum target)
{
+ if (_mesa_is_gles3(ctx)
+ && target != GL_TEXTURE_2D
+ && target != GL_TEXTURE_CUBE_MAP
+ && target != GL_TEXTURE_3D
+ && target != GL_TEXTURE_2D_ARRAY)
+ return GL_FALSE;
+
switch (dims) {
case 1:
switch (target) {
/** Helper to get a particular texture image in a texture object */
static struct gl_texture_image *
-get_tex_image(struct gl_context *ctx,
+get_tex_image(struct gl_context *ctx,
struct gl_texture_object *texObj,
GLuint face, GLuint level)
{
struct gl_texture_object *texObj,
GLint levels,
GLsizei width, GLsizei height, GLsizei depth,
- GLenum internalFormat, gl_format texFormat)
+ GLenum internalFormat, mesa_format texFormat)
{
const GLenum target = texObj->Target;
const GLuint numFaces = _mesa_num_tex_faces(target);
0, internalFormat, texFormat);
}
- _mesa_next_mipmap_level_size(target, 0, levelWidth, levelHeight, levelDepth,
+ _mesa_next_mipmap_level_size(target, 0,
+ levelWidth, levelHeight, levelDepth,
&levelWidth, &levelHeight, &levelDepth);
}
return GL_TRUE;
/**
- * Clear all fields of texture object to zeros. Used for proxy texture tests.
- * Used for proxy texture tests (and to clean up when a texture memory
- * allocation fails).
+ * Clear all fields of texture object to zeros. Used for proxy texture tests
+ * and to clean up when a texture memory allocation fails.
*/
static void
clear_texture_fields(struct gl_context *ctx,
GLint level;
GLuint face;
- for (level = 0; level < Elements(texObj->Image[0]); level++) {
+ for (level = 0; level < ARRAY_SIZE(texObj->Image[0]); level++) {
for (face = 0; face < numFaces; face++) {
struct gl_texture_image *texImage =
get_tex_image(ctx, texObj, face, level);
return;
}
- _mesa_init_teximage_fields(ctx, texImage,
- 0, 0, 0, 0, /* w, h, d, border */
- GL_NONE, MESA_FORMAT_NONE);
+ _mesa_clear_texture_image(ctx, texImage);
}
}
}
+/**
+ * Update/re-validate framebuffer object.
+ */
+static void
+update_fbo_texture(struct gl_context *ctx, struct gl_texture_object *texObj)
+{
+ const unsigned numFaces = _mesa_num_tex_faces(texObj->Target);
+ for (int level = 0; level < ARRAY_SIZE(texObj->Image[0]); level++) {
+ for (unsigned face = 0; face < numFaces; face++)
+ _mesa_update_fbo_texture(ctx, texObj, face, level);
+ }
+}
+
+
GLboolean
-_mesa_is_legal_tex_storage_format(struct gl_context *ctx, GLenum internalformat)
+_mesa_is_legal_tex_storage_format(const struct gl_context *ctx,
+ GLenum internalformat)
{
/* check internal format - note that only sized formats are allowed */
switch (internalformat) {
}
}
+
/**
* Default ctx->Driver.AllocTextureStorage() handler.
*
* checks at glTexImage* time.
*/
GLboolean
-_mesa_alloc_texture_storage(struct gl_context *ctx,
- struct gl_texture_object *texObj,
- GLsizei levels, GLsizei width,
- GLsizei height, GLsizei depth)
+_mesa_AllocTextureStorage_sw(struct gl_context *ctx,
+ struct gl_texture_object *texObj,
+ GLsizei levels, GLsizei width,
+ GLsizei height, GLsizei depth)
{
const int numFaces = _mesa_num_tex_faces(texObj->Target);
int face;
* \return GL_TRUE if any error, GL_FALSE otherwise.
*/
static GLboolean
-tex_storage_error_check(struct gl_context *ctx, GLuint dims, GLenum target,
+tex_storage_error_check(struct gl_context *ctx,
+ struct gl_texture_object *texObj,
+ GLuint dims, GLenum target,
GLsizei levels, GLenum internalformat,
- GLsizei width, GLsizei height, GLsizei depth)
+ GLsizei width, GLsizei height, GLsizei depth,
+ bool dsa)
{
- struct gl_texture_object *texObj;
+ const char* suffix = dsa ? "ture" : "";
- if (!_mesa_is_legal_tex_storage_format(ctx, internalformat)) {
- _mesa_error(ctx, GL_INVALID_ENUM,
- "glTexStorage%uD(internalformat = %s)", dims,
- _mesa_lookup_enum_by_nr(internalformat));
- return GL_TRUE;
- }
+ /* Legal format checking has been moved to texstorage and texturestorage in
+ * order to allow meta functions to use legacy formats. */
/* size check */
- if (width < 1 || height < 1 || depth < 1) {
+ if (!_mesa_valid_tex_storage_dim(width, height, depth)) {
_mesa_error(ctx, GL_INVALID_VALUE,
- "glTexStorage%uD(width, height or depth < 1)", dims);
+ "glTex%sStorage%uD(width, height or depth < 1)",
+ suffix, dims);
return GL_TRUE;
- }
+ }
- /* target check */
- if (!legal_texobj_target(ctx, dims, target)) {
- _mesa_error(ctx, GL_INVALID_ENUM,
- "glTexStorage%uD(illegal target=%s)",
- dims, _mesa_lookup_enum_by_nr(target));
- return GL_TRUE;
+ if (_mesa_is_compressed_format(ctx, internalformat)) {
+ GLenum err;
+ if (!_mesa_target_can_be_compressed(ctx, target, internalformat, &err)) {
+ _mesa_error(ctx, err,
+ "glTex%sStorage%dD(internalformat = %s)", suffix, dims,
+ _mesa_enum_to_string(internalformat));
+ return GL_TRUE;
+ }
}
/* levels check */
if (levels < 1) {
- _mesa_error(ctx, GL_INVALID_VALUE, "glTexStorage%uD(levels < 1)",
- dims);
+ _mesa_error(ctx, GL_INVALID_VALUE, "glTex%sStorage%uD(levels < 1)",
+ suffix, dims);
return GL_TRUE;
- }
+ }
/* check levels against maximum (note different error than above) */
if (levels > (GLint) _mesa_max_texture_levels(ctx, target)) {
_mesa_error(ctx, GL_INVALID_OPERATION,
- "glTexStorage%uD(levels too large)", dims);
+ "glTex%sStorage%uD(levels too large)",
+ suffix, dims);
return GL_TRUE;
}
/* check levels against width/height/depth */
if (levels > _mesa_get_tex_max_num_levels(target, width, height, depth)) {
_mesa_error(ctx, GL_INVALID_OPERATION,
- "glTexStorage%uD(too many levels for max texture dimension)",
- dims);
+ "glTex%sStorage%uD(too many levels"
+ " for max texture dimension)",
+ suffix, dims);
return GL_TRUE;
}
/* non-default texture object check */
- texObj = _mesa_get_current_tex_object(ctx, target);
if (!_mesa_is_proxy_texture(target) && (!texObj || (texObj->Name == 0))) {
_mesa_error(ctx, GL_INVALID_OPERATION,
- "glTexStorage%uD(texture object 0)", dims);
+ "glTex%sStorage%uD(texture object 0)",
+ suffix, dims);
return GL_TRUE;
}
/* Check if texObj->Immutable is set */
if (!_mesa_is_proxy_texture(target) && texObj->Immutable) {
- _mesa_error(ctx, GL_INVALID_OPERATION, "glTexStorage%uD(immutable)",
- dims);
+ _mesa_error(ctx, GL_INVALID_OPERATION, "glTex%sStorage%uD(immutable)",
+ suffix, dims);
+ return GL_TRUE;
+ }
+
+ /* additional checks for depth textures */
+ if (!_mesa_legal_texture_base_format_for_target(ctx, target, internalformat)) {
+ _mesa_error(ctx, GL_INVALID_OPERATION, "glTex%sStorage%uD(bad target for texture)",
+ suffix, dims);
return GL_TRUE;
}
/**
- * Helper used by _mesa_TexStorage1/2/3D().
+ * Helper that does the storage allocation for _mesa_TexStorage1/2/3D()
+ * and _mesa_TextureStorage1/2/3D().
*/
-static void
-texstorage(GLuint dims, GLenum target, GLsizei levels, GLenum internalformat,
- GLsizei width, GLsizei height, GLsizei depth)
+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)
{
- struct gl_texture_object *texObj;
GLboolean sizeOK, dimensionsOK;
- gl_format texFormat;
-
- GET_CURRENT_CONTEXT(ctx);
+ mesa_format texFormat;
+ const char* suffix = dsa ? "ture" : "";
- if (MESA_VERBOSE & (VERBOSE_API|VERBOSE_TEXTURE))
- _mesa_debug(ctx, "glTexStorage%uD %s %d %s %d %d %d\n",
- dims,
- _mesa_lookup_enum_by_nr(target), levels,
- _mesa_lookup_enum_by_nr(internalformat),
- width, height, depth);
+ assert(texObj);
- if (tex_storage_error_check(ctx, dims, target, levels,
- internalformat, width, height, depth)) {
+ if (tex_storage_error_check(ctx, texObj, dims, target, levels,
+ internalformat, width, height, depth, dsa)) {
return; /* error was recorded */
}
- texObj = _mesa_get_current_tex_object(ctx, target);
- assert(texObj);
-
texFormat = _mesa_choose_texture_format(ctx, texObj, target, 0,
internalformat, GL_NONE, GL_NONE);
assert(texFormat != MESA_FORMAT_NONE);
dimensionsOK = _mesa_legal_texture_dimensions(ctx, target, 0,
width, height, depth, 0);
- sizeOK = ctx->Driver.TestProxyTexImage(ctx, target, 0, texFormat,
- width, height, depth, 0);
+ sizeOK = ctx->Driver.TestProxyTexImage(ctx, target, levels, 0, texFormat,
+ 1, width, height, depth);
- if (_mesa_is_proxy_texture(texObj->Target)) {
+ if (_mesa_is_proxy_texture(target)) {
if (dimensionsOK && sizeOK) {
initialize_texture_fields(ctx, texObj, levels, width, height, depth,
internalformat, texFormat);
else {
if (!dimensionsOK) {
_mesa_error(ctx, GL_INVALID_VALUE,
- "glTexStorage%uD(invalid width, height or depth)", dims);
+ "glTex%sStorage%uD(invalid width, height or depth)",
+ suffix, dims);
return;
}
if (!sizeOK) {
_mesa_error(ctx, GL_OUT_OF_MEMORY,
- "glTexStorage%uD(texture too large)", dims);
+ "glTex%sStorage%uD(texture too large)",
+ suffix, dims);
}
assert(levels > 0);
* state but this puts things in a consistent state.
*/
clear_texture_fields(ctx, texObj);
- _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexStorage%uD", dims);
+ _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTex%sStorage%uD",
+ suffix, dims);
return;
}
_mesa_set_texture_view_state(ctx, texObj, target, levels);
+ update_fbo_texture(ctx, texObj);
+ }
+}
+
+
+/**
+ * Helper used by _mesa_TexStorage1/2/3D().
+ */
+static void
+texstorage(GLuint dims, GLenum target, GLsizei levels, GLenum internalformat,
+ GLsizei width, GLsizei height, GLsizei depth)
+{
+ struct gl_texture_object *texObj;
+ GET_CURRENT_CONTEXT(ctx);
+
+ /* Check target. This is done here so that _mesa_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));
+ return;
+ }
+
+ if (MESA_VERBOSE & (VERBOSE_API|VERBOSE_TEXTURE))
+ _mesa_debug(ctx, "glTexStorage%uD %s %d %s %d %d %d\n",
+ dims,
+ _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,
+ _mesa_enum_to_string(internalformat));
+ return;
}
+
+ texObj = _mesa_get_current_tex_object(ctx, target);
+ if (!texObj)
+ return;
+
+ _mesa_texture_storage(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)
+{
+ 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_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,
+ _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);
+ return;
+ }
+
+ /* Check target. This is done here so that _mesa_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));
+ return;
+ }
+
+ _mesa_texture_storage(ctx, dims, texObj, texObj->Target,
+ levels, internalformat, width, height, depth, true);
}
}
+void GLAPIENTRY
+_mesa_TextureStorage1D(GLuint texture, GLsizei levels, GLenum internalformat,
+ GLsizei width)
+{
+ texturestorage(1, texture, levels, internalformat, width, 1, 1);
+}
+
+
+void GLAPIENTRY
+_mesa_TextureStorage2D(GLuint texture, GLsizei levels,
+ GLenum internalformat,
+ GLsizei width, GLsizei height)
+{
+ texturestorage(2, texture, levels, internalformat, width, height, 1);
+}
+
+
+void GLAPIENTRY
+_mesa_TextureStorage3D(GLuint texture, GLsizei levels, GLenum internalformat,
+ GLsizei width, GLsizei height, GLsizei depth)
+{
+ texturestorage(3, texture, levels, internalformat, width, height, depth);
+}
+
/*
* Note: we don't support GL_EXT_direct_state_access and the spec says
GLenum internalformat,
GLsizei width)
{
+ GET_CURRENT_CONTEXT(ctx);
+
(void) texture;
(void) target;
(void) levels;
(void) internalformat;
(void) width;
- /* no-op */
+
+ _mesa_error(ctx, GL_INVALID_OPERATION,
+ "glTextureStorage1DEXT not supported");
}
GLenum internalformat,
GLsizei width, GLsizei height)
{
+ GET_CURRENT_CONTEXT(ctx);
+
(void) texture;
(void) target;
(void) levels;
(void) internalformat;
(void) width;
(void) height;
- /* no-op */
-}
+ _mesa_error(ctx, GL_INVALID_OPERATION,
+ "glTextureStorage2DEXT not supported");
+}
void GLAPIENTRY
GLenum internalformat,
GLsizei width, GLsizei height, GLsizei depth)
{
+ GET_CURRENT_CONTEXT(ctx);
+
(void) texture;
(void) target;
(void) levels;
(void) width;
(void) height;
(void) depth;
- /* no-op */
+
+ _mesa_error(ctx, GL_INVALID_OPERATION,
+ "glTextureStorage3DEXT not supported");
}