mesa: core support for GL_ARB_texture_buffer_object
No GLSL or driver support yet.
This commit is contained in:
Brian Paul
@@ -681,8 +681,10 @@ _mesa_delete_texture_image(struct gl_context *ctx,
|
||||
GLboolean
|
||||
_mesa_is_proxy_texture(GLenum target)
|
||||
{
|
||||
/* NUM_TEXTURE_TARGETS should match number of terms below */
|
||||
assert(NUM_TEXTURE_TARGETS == 7);
|
||||
/* NUM_TEXTURE_TARGETS should match number of terms below,
|
||||
* except there's no proxy for GL_TEXTURE_BUFFER.
|
||||
*/
|
||||
assert(NUM_TEXTURE_TARGETS == 8);
|
||||
|
||||
return (target == GL_PROXY_TEXTURE_1D ||
|
||||
target == GL_PROXY_TEXTURE_2D ||
|
||||
@@ -794,6 +796,9 @@ _mesa_select_tex_object(struct gl_context *ctx,
|
||||
return arrayTex ? texUnit->CurrentTex[TEXTURE_2D_ARRAY_INDEX] : NULL;
|
||||
case GL_PROXY_TEXTURE_2D_ARRAY_EXT:
|
||||
return arrayTex ? ctx->Texture.ProxyTex[TEXTURE_2D_ARRAY_INDEX] : NULL;
|
||||
case GL_TEXTURE_BUFFER:
|
||||
return ctx->Extensions.ARB_texture_buffer_object
|
||||
? texUnit->CurrentTex[TEXTURE_BUFFER_INDEX] : NULL;
|
||||
default:
|
||||
_mesa_problem(NULL, "bad target in _mesa_select_tex_object()");
|
||||
return NULL;
|
||||
@@ -981,6 +986,8 @@ _mesa_max_texture_levels(struct gl_context *ctx, GLenum target)
|
||||
return (ctx->Extensions.MESA_texture_array ||
|
||||
ctx->Extensions.EXT_texture_array)
|
||||
? ctx->Const.MaxTextureLevels : 0;
|
||||
case GL_TEXTURE_BUFFER:
|
||||
/* fall-through */
|
||||
default:
|
||||
return 0; /* bad target */
|
||||
}
|
||||
@@ -1017,6 +1024,8 @@ _mesa_get_texture_dimensions(GLenum target)
|
||||
case GL_TEXTURE_2D_ARRAY:
|
||||
case GL_PROXY_TEXTURE_2D_ARRAY:
|
||||
return 3;
|
||||
case GL_TEXTURE_BUFFER:
|
||||
/* fall-through */
|
||||
default:
|
||||
_mesa_problem(NULL, "invalid target 0x%x in get_texture_dimensions()",
|
||||
target);
|
||||
@@ -3551,3 +3560,272 @@ _mesa_CompressedTexSubImage3DARB(GLenum target, GLint level, GLint xoffset,
|
||||
compressed_tex_sub_image(3, target, level, xoffset, yoffset, zoffset,
|
||||
width, height, depth, format, imageSize, data);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Helper for glTexBuffer(). Check if internalFormat is legal. If so,
|
||||
* return the basic data type and number of components for the format.
|
||||
* \param return GL_TRUE if internalFormat is legal, GL_FALSE otherwise
|
||||
*/
|
||||
static GLboolean
|
||||
get_sized_format_info(const struct gl_context *ctx, GLenum internalFormat,
|
||||
GLenum *datatype, GLuint *components)
|
||||
{
|
||||
switch (internalFormat) {
|
||||
case GL_ALPHA8:
|
||||
*datatype = GL_UNSIGNED_BYTE;
|
||||
*components = 1;
|
||||
break;
|
||||
case GL_ALPHA16:
|
||||
*datatype = GL_UNSIGNED_SHORT;
|
||||
*components = 1;
|
||||
break;
|
||||
case GL_ALPHA16F_ARB:
|
||||
*datatype = GL_HALF_FLOAT;
|
||||
*components = 1;
|
||||
break;
|
||||
case GL_ALPHA32F_ARB:
|
||||
*datatype = GL_FLOAT;
|
||||
*components = 1;
|
||||
break;
|
||||
case GL_ALPHA8I_EXT:
|
||||
*datatype = GL_BYTE;
|
||||
*components = 1;
|
||||
break;
|
||||
case GL_ALPHA16I_EXT:
|
||||
*datatype = GL_SHORT;
|
||||
*components = 1;
|
||||
break;
|
||||
case GL_ALPHA32I_EXT:
|
||||
*datatype = GL_INT;
|
||||
*components = 1;
|
||||
break;
|
||||
case GL_ALPHA8UI_EXT:
|
||||
*datatype = GL_UNSIGNED_BYTE;
|
||||
*components = 1;
|
||||
break;
|
||||
case GL_ALPHA16UI_EXT:
|
||||
*datatype = GL_UNSIGNED_SHORT;
|
||||
*components = 1;
|
||||
break;
|
||||
case GL_ALPHA32UI_EXT:
|
||||
*datatype = GL_UNSIGNED_INT;
|
||||
*components = 1;
|
||||
break;
|
||||
case GL_LUMINANCE8:
|
||||
*datatype = GL_UNSIGNED_BYTE;
|
||||
*components = 1;
|
||||
break;
|
||||
case GL_LUMINANCE16:
|
||||
*datatype = GL_UNSIGNED_SHORT;
|
||||
*components = 1;
|
||||
break;
|
||||
case GL_LUMINANCE16F_ARB:
|
||||
*datatype = GL_HALF_FLOAT;
|
||||
*components = 1;
|
||||
break;
|
||||
case GL_LUMINANCE32F_ARB:
|
||||
*datatype = GL_FLOAT;
|
||||
*components = 1;
|
||||
break;
|
||||
case GL_LUMINANCE8I_EXT:
|
||||
*datatype = GL_BYTE;
|
||||
*components = 1;
|
||||
break;
|
||||
case GL_LUMINANCE16I_EXT:
|
||||
*datatype = GL_SHORT;
|
||||
*components = 1;
|
||||
break;
|
||||
case GL_LUMINANCE32I_EXT:
|
||||
*datatype = GL_INT;
|
||||
*components = 1;
|
||||
break;
|
||||
case GL_LUMINANCE8UI_EXT:
|
||||
*datatype = GL_UNSIGNED_BYTE;
|
||||
*components = 1;
|
||||
break;
|
||||
case GL_LUMINANCE16UI_EXT:
|
||||
*datatype = GL_UNSIGNED_SHORT;
|
||||
*components = 1;
|
||||
break;
|
||||
case GL_LUMINANCE32UI_EXT:
|
||||
*datatype = GL_UNSIGNED_INT;
|
||||
*components = 1;
|
||||
break;
|
||||
case GL_LUMINANCE8_ALPHA8:
|
||||
*datatype = GL_UNSIGNED_BYTE;
|
||||
*components = 2;
|
||||
break;
|
||||
case GL_LUMINANCE16_ALPHA16:
|
||||
*datatype = GL_UNSIGNED_SHORT;
|
||||
*components = 2;
|
||||
break;
|
||||
case GL_LUMINANCE_ALPHA16F_ARB:
|
||||
*datatype = GL_HALF_FLOAT;
|
||||
*components = 2;
|
||||
break;
|
||||
case GL_LUMINANCE_ALPHA32F_ARB:
|
||||
*datatype = GL_FLOAT;
|
||||
*components = 2;
|
||||
break;
|
||||
case GL_LUMINANCE_ALPHA8I_EXT:
|
||||
*datatype = GL_BYTE;
|
||||
*components = 2;
|
||||
break;
|
||||
case GL_LUMINANCE_ALPHA16I_EXT:
|
||||
*datatype = GL_SHORT;
|
||||
*components = 2;
|
||||
break;
|
||||
case GL_LUMINANCE_ALPHA32I_EXT:
|
||||
*datatype = GL_INT;
|
||||
*components = 2;
|
||||
break;
|
||||
case GL_LUMINANCE_ALPHA8UI_EXT:
|
||||
*datatype = GL_UNSIGNED_BYTE;
|
||||
*components = 2;
|
||||
break;
|
||||
case GL_LUMINANCE_ALPHA16UI_EXT:
|
||||
*datatype = GL_UNSIGNED_SHORT;
|
||||
*components = 2;
|
||||
break;
|
||||
case GL_LUMINANCE_ALPHA32UI_EXT:
|
||||
*datatype = GL_UNSIGNED_INT;
|
||||
*components = 2;
|
||||
break;
|
||||
case GL_INTENSITY8:
|
||||
*datatype = GL_UNSIGNED_BYTE;
|
||||
*components = 1;
|
||||
break;
|
||||
case GL_INTENSITY16:
|
||||
*datatype = GL_UNSIGNED_SHORT;
|
||||
*components = 1;
|
||||
break;
|
||||
case GL_INTENSITY16F_ARB:
|
||||
*datatype = GL_HALF_FLOAT;
|
||||
*components = 1;
|
||||
break;
|
||||
case GL_INTENSITY32F_ARB:
|
||||
*datatype = GL_FLOAT;
|
||||
*components = 1;
|
||||
break;
|
||||
case GL_INTENSITY8I_EXT:
|
||||
*datatype = GL_BYTE;
|
||||
*components = 1;
|
||||
break;
|
||||
case GL_INTENSITY16I_EXT:
|
||||
*datatype = GL_SHORT;
|
||||
*components = 1;
|
||||
break;
|
||||
case GL_INTENSITY32I_EXT:
|
||||
*datatype = GL_INT;
|
||||
*components = 1;
|
||||
break;
|
||||
case GL_INTENSITY8UI_EXT:
|
||||
*datatype = GL_UNSIGNED_BYTE;
|
||||
*components = 1;
|
||||
break;
|
||||
case GL_INTENSITY16UI_EXT:
|
||||
*datatype = GL_UNSIGNED_SHORT;
|
||||
*components = 1;
|
||||
break;
|
||||
case GL_INTENSITY32UI_EXT:
|
||||
*datatype = GL_UNSIGNED_INT;
|
||||
*components = 1;
|
||||
break;
|
||||
case GL_RGBA8:
|
||||
*datatype = GL_UNSIGNED_BYTE;
|
||||
*components = 4;
|
||||
break;
|
||||
case GL_RGBA16:
|
||||
*datatype = GL_UNSIGNED_SHORT;
|
||||
*components = 4;
|
||||
break;
|
||||
case GL_RGBA16F_ARB:
|
||||
*datatype = GL_HALF_FLOAT;
|
||||
*components = 4;
|
||||
break;
|
||||
case GL_RGBA32F_ARB:
|
||||
*datatype = GL_FLOAT;
|
||||
*components = 4;
|
||||
break;
|
||||
case GL_RGBA8I_EXT:
|
||||
*datatype = GL_BYTE;
|
||||
*components = 4;
|
||||
break;
|
||||
case GL_RGBA16I_EXT:
|
||||
*datatype = GL_SHORT;
|
||||
*components = 4;
|
||||
break;
|
||||
case GL_RGBA32I_EXT:
|
||||
*datatype = GL_INT;
|
||||
*components = 4;
|
||||
break;
|
||||
case GL_RGBA8UI_EXT:
|
||||
*datatype = GL_UNSIGNED_BYTE;
|
||||
*components = 4;
|
||||
break;
|
||||
case GL_RGBA16UI_EXT:
|
||||
*datatype = GL_UNSIGNED_SHORT;
|
||||
*components = 4;
|
||||
break;
|
||||
case GL_RGBA32UI_EXT:
|
||||
*datatype = GL_UNSIGNED_INT;
|
||||
*components = 4;
|
||||
break;
|
||||
default:
|
||||
return GL_FALSE;
|
||||
}
|
||||
|
||||
if (*datatype == GL_FLOAT && !ctx->Extensions.ARB_texture_float)
|
||||
return GL_FALSE;
|
||||
|
||||
if (*datatype == GL_HALF_FLOAT && !ctx->Extensions.ARB_half_float_pixel)
|
||||
return GL_FALSE;
|
||||
|
||||
return GL_TRUE;
|
||||
}
|
||||
|
||||
|
||||
/** GL_ARB_texture_buffer_object */
|
||||
void GLAPIENTRY
|
||||
_mesa_TexBuffer(GLenum target, GLenum internalFormat, GLuint buffer)
|
||||
{
|
||||
struct gl_texture_object *texObj;
|
||||
struct gl_buffer_object *bufObj;
|
||||
GLenum dataType;
|
||||
GLuint comps;
|
||||
|
||||
GET_CURRENT_CONTEXT(ctx);
|
||||
ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
|
||||
|
||||
if (!ctx->Extensions.ARB_texture_buffer_object) {
|
||||
_mesa_error(ctx, GL_INVALID_OPERATION, "glTexBuffer");
|
||||
return;
|
||||
}
|
||||
|
||||
if (target != GL_TEXTURE_BUFFER_ARB) {
|
||||
_mesa_error(ctx, GL_INVALID_ENUM, "glTexBuffer(target)");
|
||||
return;
|
||||
}
|
||||
|
||||
if (!get_sized_format_info(ctx, internalFormat, &dataType, &comps)) {
|
||||
_mesa_error(ctx, GL_INVALID_ENUM, "glTexBuffer(internalFormat 0x%x)",
|
||||
internalFormat);
|
||||
return;
|
||||
}
|
||||
|
||||
bufObj = _mesa_lookup_bufferobj(ctx, buffer);
|
||||
if (buffer && !bufObj) {
|
||||
_mesa_error(ctx, GL_INVALID_OPERATION, "glTexBuffer(buffer %u)", buffer);
|
||||
return;
|
||||
}
|
||||
|
||||
texObj = _mesa_get_current_tex_object(ctx, target);
|
||||
|
||||
_mesa_lock_texture(ctx, texObj);
|
||||
{
|
||||
_mesa_reference_buffer_object(ctx, &texObj->BufferObject, bufObj);
|
||||
texObj->BufferObjectFormat = internalFormat;
|
||||
}
|
||||
_mesa_unlock_texture(ctx, texObj);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user