target = img->TexObject->Target;
img->_BaseFormat = _mesa_base_tex_format( ctx, internalFormat );
- ASSERT(img->_BaseFormat > 0);
+ ASSERT(img->_BaseFormat != -1);
img->InternalFormat = internalFormat;
img->Border = border;
img->Width = width;
mutable_tex_object(struct gl_context *ctx, GLenum target)
{
struct gl_texture_object *texObj = _mesa_get_current_tex_object(ctx, target);
+ if (!texObj)
+ return GL_FALSE;
+
return !texObj->Immutable;
}
_mesa_update_state(ctx);
texObj = _mesa_get_current_tex_object(ctx, target);
+ if (!texObj)
+ return;
+
_mesa_lock_texture(ctx, texObj);
if (texObj->Immutable) {
{
struct gl_texture_object *texObj;
struct gl_texture_image *texImage;
+
texObj = _mesa_get_current_tex_object(ctx, target);
+ if (!texObj)
+ return;
+
if (texsubimage_error_check(ctx, dims, texObj, target, level,
xoffset, yoffset, zoffset,
width, height, depth, format, type, false)) {
/* Must handle special case GL_TEXTURE_CUBE_MAP. */
if (texObj->Target == GL_TEXTURE_CUBE_MAP) {
+ GLint rowStride;
/* Error checking */
if (texObj->NumLayers < 6) {
dims);
return;
}
- for (i = 0; i < 6; ++i) { /* For each face. */
- if (!texObj->Image[i][level]) {
- /* Not enough image planes for a cube map. The spec does not say
- * what should happen in this case because the user has always
- * specified each cube face separately (using
- * GL_TEXTURE_CUBE_MAP_POSITIVE_X+i) in previous GL versions.
- * This is addressed in Khronos Bug 13223.
- */
- _mesa_error(ctx, GL_INVALID_OPERATION,
- "glTextureSubImage%uD(insufficient cube map storage)",
- dims);
- return;
- }
+
+ /*
+ * What do we do if the user created a texture with the following code
+ * and then called this function with its handle?
+ *
+ * GLuint tex;
+ * glCreateTextures(GL_TEXTURE_CUBE_MAP, 1, &tex);
+ * glBindTexture(GL_TEXTURE_CUBE_MAP, tex);
+ * glTexImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_X, 0, ...);
+ * glTexImage2D(GL_TEXTURE_CUBE_MAP_NEGATIVE_X, 0, ...);
+ * glTexImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_Y, 0, ...);
+ * // Note: GL_TEXTURE_CUBE_MAP_NEGATIVE_Y not set, or given the
+ * // wrong format, or given the wrong size, etc.
+ * glTexImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_Z, 0, ...);
+ * glTexImage2D(GL_TEXTURE_CUBE_MAP_NEGATIVE_Z, 0, ...);
+ *
+ * A bug has been filed against the spec for this case. In the
+ * meantime, we will check for cube completeness.
+ *
+ * According to Section 8.17 Texture Completeness in the OpenGL 4.5
+ * Core Profile spec (30.10.2014):
+ * "[A] cube map texture is cube complete if the
+ * following conditions all hold true: The [base level] texture
+ * images of each of the six cube map faces have identical, positive,
+ * and square dimensions. The [base level] images were each specified
+ * with the same internal format."
+ *
+ * It seems reasonable to check for cube completeness of an arbitrary
+ * level here so that the image data has a consistent format and size.
+ */
+ if (!_mesa_cube_level_complete(texObj, level)) {
+ _mesa_error(ctx, GL_INVALID_OPERATION,
+ "glTextureSubImage%uD(cube map incomplete)",
+ dims);
+ return;
}
+ rowStride = _mesa_image_image_stride(&ctx->Unpack, width, height,
+ format, type);
/* Copy in each face. */
for (i = 0; i < 6; ++i) {
texImage = texObj->Image[i][level];
level, xoffset, yoffset, zoffset,
width, height, 1, format,
type, pixels, true);
- pixels += _mesa_image_image_stride(&ctx->Unpack, width, height,
- format, type);
+ pixels = (GLubyte *) pixels + rowStride;
}
}
else {
case GL_LUMINANCE_ALPHA8I_EXT:
return MESA_FORMAT_LA_SINT8;
case GL_LUMINANCE_ALPHA16I_EXT:
- return MESA_FORMAT_LA_SINT8;
- case GL_LUMINANCE_ALPHA32I_EXT:
return MESA_FORMAT_LA_SINT16;
+ case GL_LUMINANCE_ALPHA32I_EXT:
+ return MESA_FORMAT_LA_SINT32;
case GL_LUMINANCE_ALPHA8UI_EXT:
return MESA_FORMAT_LA_UINT8;
case GL_LUMINANCE_ALPHA16UI_EXT:
}
-static void
-texbufferrange(struct gl_context *ctx, GLenum target, GLenum internalFormat,
- struct gl_buffer_object *bufObj,
- GLintptr offset, GLsizeiptr size)
+void
+_mesa_texture_buffer_range(struct gl_context *ctx,
+ struct gl_texture_object *texObj, GLenum target,
+ GLenum internalFormat,
+ struct gl_buffer_object *bufObj,
+ GLintptr offset, GLsizeiptr size, bool range,
+ bool dsa)
{
- struct gl_texture_object *texObj;
mesa_format format;
FLUSH_VERTICES(ctx, 0);
- if (target != GL_TEXTURE_BUFFER_ARB) {
- _mesa_error(ctx, GL_INVALID_ENUM, "glTexBuffer(target)");
- return;
- }
-
format = _mesa_validate_texbuffer_format(ctx, internalFormat);
if (format == MESA_FORMAT_NONE) {
- _mesa_error(ctx, GL_INVALID_ENUM, "glTexBuffer(internalFormat 0x%x)",
- internalFormat);
+ _mesa_error(ctx, GL_INVALID_ENUM,
+ "glTex%sBuffer%s(internalFormat 0x%x)", dsa ? "ture" : "",
+ range ? "Range" : "", internalFormat);
return;
}
- texObj = _mesa_get_current_tex_object(ctx, target);
-
_mesa_lock_texture(ctx, texObj);
{
_mesa_reference_buffer_object(ctx, &texObj->BufferObject, bufObj);
void GLAPIENTRY
_mesa_TexBuffer(GLenum target, GLenum internalFormat, GLuint buffer)
{
+ struct gl_texture_object *texObj;
struct gl_buffer_object *bufObj;
GET_CURRENT_CONTEXT(ctx);
+ /* Need to catch this before it gets to _mesa_get_current_tex_object */
+ if (target != GL_TEXTURE_BUFFER_ARB) {
+ _mesa_error(ctx, GL_INVALID_ENUM, "glTexBuffer(target)");
+ return;
+ }
+
/* NOTE: ARB_texture_buffer_object has interactions with
* the compatibility profile that are not implemented.
*/
return;
}
- texbufferrange(ctx, target, internalFormat, bufObj, 0, buffer ? -1 : 0);
+ texObj = _mesa_get_current_tex_object(ctx, target);
+ if (!texObj)
+ return;
+
+ _mesa_texture_buffer_range(ctx, texObj, target, internalFormat, bufObj, 0,
+ buffer ? -1 : 0, false, false);
}
_mesa_TexBufferRange(GLenum target, GLenum internalFormat, GLuint buffer,
GLintptr offset, GLsizeiptr size)
{
+ struct gl_texture_object *texObj;
struct gl_buffer_object *bufObj;
GET_CURRENT_CONTEXT(ctx);
+ /* Need to catch this before it gets to _mesa_get_current_tex_object */
+ if (target != GL_TEXTURE_BUFFER_ARB) {
+ _mesa_error(ctx, GL_INVALID_ENUM, "glTexBufferRange(target)");
+ return;
+ }
+
if (!(ctx->API == API_OPENGL_CORE &&
ctx->Extensions.ARB_texture_buffer_range)) {
_mesa_error(ctx, GL_INVALID_OPERATION, "glTexBufferRange");
size = 0;
}
- texbufferrange(ctx, target, internalFormat, bufObj, offset, size);
+ texObj = _mesa_get_current_tex_object(ctx, target);
+ if (!texObj)
+ return;
+
+ _mesa_texture_buffer_range(ctx, texObj, target, internalFormat, bufObj,
+ offset, size, true, false);
}
+void GLAPIENTRY
+_mesa_TextureBuffer(GLuint texture, GLenum internalFormat, GLuint buffer)
+{
+ struct gl_texture_object *texObj;
+ struct gl_buffer_object *bufObj;
+
+ GET_CURRENT_CONTEXT(ctx);
+
+ /* NOTE: ARB_texture_buffer_object has interactions with
+ * the compatibility profile that are not implemented.
+ */
+ if (!(ctx->API == API_OPENGL_CORE &&
+ ctx->Extensions.ARB_texture_buffer_object)) {
+ _mesa_error(ctx, GL_INVALID_OPERATION, "glTextureBuffer");
+ return;
+ }
+
+ bufObj = _mesa_lookup_bufferobj(ctx, buffer);
+ if (!bufObj && buffer) {
+ _mesa_error(ctx, GL_INVALID_OPERATION, "glTextureBuffer(buffer %u)",
+ buffer);
+ return;
+ }
+
+ /* Get the texture object by Name. */
+ texObj = _mesa_lookup_texture_err(ctx, texture,
+ "glTextureBuffer(texture)");
+ if (!texObj)
+ return;
+
+ if (texObj->Target != GL_TEXTURE_BUFFER_ARB) {
+ _mesa_error(ctx, GL_INVALID_ENUM, "glTextureBuffer(target)");
+ return;
+ }
+
+ _mesa_texture_buffer_range(ctx, texObj, texObj->Target, internalFormat,
+ bufObj, 0, buffer ? -1 : 0, false, true);
+}
static GLboolean
is_renderable_texture_format(struct gl_context *ctx, GLenum internalformat)
}
}
- texObj->Immutable = immutable;
+ texObj->Immutable |= immutable;
if (immutable) {
_mesa_set_texture_view_state(ctx, texObj, target, 1);
{
struct gl_texture_object *texObj;
GET_CURRENT_CONTEXT(ctx);
+
texObj = _mesa_get_current_tex_object(ctx, target);
+ if (!texObj)
+ return;
_mesa_texture_image_multisample(ctx, 2, texObj, target, samples,
internalformat, width, height, 1,
{
struct gl_texture_object *texObj;
GET_CURRENT_CONTEXT(ctx);
+
texObj = _mesa_get_current_tex_object(ctx, target);
+ if (!texObj)
+ return;
_mesa_texture_image_multisample(ctx, 3, texObj, target, samples,
internalformat, width, height, depth,
{
struct gl_texture_object *texObj;
GET_CURRENT_CONTEXT(ctx);
+
texObj = _mesa_get_current_tex_object(ctx, target);
+ if (!texObj)
+ return;
_mesa_texture_image_multisample(ctx, 2, texObj, target, samples,
internalformat, width, height, 1,
{
struct gl_texture_object *texObj;
GET_CURRENT_CONTEXT(ctx);
+
texObj = _mesa_get_current_tex_object(ctx, target);
+ if (!texObj)
+ return;
_mesa_texture_image_multisample(ctx, 3, texObj, target, samples,
internalformat, width, height, depth,
projects / mesa.git / blobdiff