[Mesa-dev] [RFC PATCH 04/26] mesa: add texobj support for ARB_texture_multisample
Brian Paul
brianp at vmware.com
Wed Jan 2 09:59:43 PST 2013
On 12/29/2012 05:35 AM, Chris Forbes wrote:
> V2: Allow multisample texture targets in glInvalidateTexSubImage too.
> This was already partly there, but I missed it the first time around
> since the interaction is defined in a newer extension.
>
> Signed-off-by: Chris Forbes<chrisf at ijw.co.nz>
> ---
> src/mesa/main/fbobject.c | 5 +++++
> src/mesa/main/mtypes.h | 4 ++++
> src/mesa/main/shared.c | 2 ++
> src/mesa/main/teximage.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++--
> src/mesa/main/texobj.c | 28 +++++++++++++++++++++---
> src/mesa/main/texparam.c | 3 +++
> src/mesa/main/texstate.c | 2 ++
> 7 files changed, 94 insertions(+), 5 deletions(-)
>
> diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
> index ce77b9f..c541695 100644
> --- a/src/mesa/main/fbobject.c
> +++ b/src/mesa/main/fbobject.c
> @@ -2217,6 +2217,11 @@ _mesa_FramebufferTexture2D(GLenum target, GLenum attachment,
> error = (_mesa_is_gles(ctx)&& ctx->Version< 30)
> || !ctx->Extensions.EXT_texture_array;
> break;
> + case GL_TEXTURE_2D_MULTISAMPLE:
> + case GL_TEXTURE_2D_MULTISAMPLE_ARRAY:
> + error = _mesa_is_gles(ctx)
> + || !ctx->Extensions.ARB_texture_multisample;
> + break;
> default:
> error = GL_TRUE;
> }
> diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
> index 7c513a1..db87ead 100644
> --- a/src/mesa/main/mtypes.h
> +++ b/src/mesa/main/mtypes.h
> @@ -1148,6 +1148,8 @@ struct gl_stencil_attrib
> */
> typedef enum
> {
> + TEXTURE_2D_MULTISAMPLE_INDEX,
> + TEXTURE_2D_MULTISAMPLE_ARRAY_INDEX,
> TEXTURE_CUBE_ARRAY_INDEX,
> TEXTURE_BUFFER_INDEX,
> TEXTURE_2D_ARRAY_INDEX,
> @@ -1167,6 +1169,8 @@ typedef enum
> * Used for Texture.Unit[]._ReallyEnabled flags.
> */
> /*@{*/
> +#define TEXTURE_2D_MULTISAMPLE_BIT (1<< TEXTURE_2D_MULTISAMPLE_INDEX)
> +#define TEXTURE_2D_MULTISAMPLE_ARRAY_BIT (1<< TEXTURE_2D_MULTISAMPLE_ARRAY_INDEX)
> #define TEXTURE_CUBE_ARRAY_BIT (1<< TEXTURE_CUBE_ARRAY_INDEX)
> #define TEXTURE_BUFFER_BIT (1<< TEXTURE_BUFFER_INDEX)
> #define TEXTURE_2D_ARRAY_BIT (1<< TEXTURE_2D_ARRAY_INDEX)
> diff --git a/src/mesa/main/shared.c b/src/mesa/main/shared.c
> index a98a45c..4081259 100644
> --- a/src/mesa/main/shared.c
> +++ b/src/mesa/main/shared.c
> @@ -92,6 +92,8 @@ _mesa_alloc_shared_state(struct gl_context *ctx)
> for (i = 0; i< NUM_TEXTURE_TARGETS; i++) {
> /* NOTE: the order of these enums matches the TEXTURE_x_INDEX values */
> static const GLenum targets[] = {
> + GL_TEXTURE_2D_MULTISAMPLE,
> + GL_TEXTURE_2D_MULTISAMPLE_ARRAY,
> GL_TEXTURE_CUBE_MAP_ARRAY,
> GL_TEXTURE_BUFFER,
> GL_TEXTURE_2D_ARRAY_EXT,
> diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
> index 078ac71..b24efda 100644
> --- a/src/mesa/main/teximage.c
> +++ b/src/mesa/main/teximage.c
> @@ -670,7 +670,7 @@ _mesa_is_proxy_texture(GLenum target)
> * NUM_TEXTURE_TARGETS should match number of terms below, except there's no
> * proxy for GL_TEXTURE_BUFFER and GL_TEXTURE_EXTERNAL_OES.
> */
> - assert(NUM_TEXTURE_TARGETS == 8 + 2);
> + assert(NUM_TEXTURE_TARGETS == 10 + 2);
>
> return (target == GL_PROXY_TEXTURE_1D ||
> target == GL_PROXY_TEXTURE_2D ||
> @@ -679,7 +679,9 @@ _mesa_is_proxy_texture(GLenum target)
> target == GL_PROXY_TEXTURE_RECTANGLE_NV ||
> target == GL_PROXY_TEXTURE_1D_ARRAY_EXT ||
> target == GL_PROXY_TEXTURE_2D_ARRAY_EXT ||
> - target == GL_PROXY_TEXTURE_CUBE_MAP_ARRAY);
> + target == GL_PROXY_TEXTURE_CUBE_MAP_ARRAY ||
> + target == GL_PROXY_TEXTURE_2D_MULTISAMPLE ||
> + target == GL_PROXY_TEXTURE_2D_MULTISAMPLE_ARRAY);
> }
>
>
> @@ -720,6 +722,12 @@ _mesa_get_proxy_target(GLenum target)
> case GL_TEXTURE_CUBE_MAP_ARRAY:
> case GL_PROXY_TEXTURE_CUBE_MAP_ARRAY:
> return GL_PROXY_TEXTURE_CUBE_MAP_ARRAY;
> + case GL_TEXTURE_2D_MULTISAMPLE:
> + case GL_PROXY_TEXTURE_2D_MULTISAMPLE:
> + return GL_PROXY_TEXTURE_2D_MULTISAMPLE;
> + case GL_TEXTURE_2D_MULTISAMPLE_ARRAY:
> + case GL_PROXY_TEXTURE_2D_MULTISAMPLE_ARRAY:
> + return GL_PROXY_TEXTURE_2D_MULTISAMPLE_ARRAY;
> default:
> _mesa_problem(NULL, "unexpected target in _mesa_get_proxy_target()");
> return 0;
> @@ -797,6 +805,18 @@ _mesa_select_tex_object(struct gl_context *ctx,
> case GL_TEXTURE_EXTERNAL_OES:
> return ctx->Extensions.OES_EGL_image_external
> ? texUnit->CurrentTex[TEXTURE_EXTERNAL_INDEX] : NULL;
> + case GL_TEXTURE_2D_MULTISAMPLE:
> + return ctx->Extensions.ARB_texture_multisample
> + ? texUnit->CurrentTex[TEXTURE_2D_MULTISAMPLE_INDEX] : NULL;
> + case GL_PROXY_TEXTURE_2D_MULTISAMPLE:
> + return ctx->Extensions.ARB_texture_multisample
> + ? ctx->Texture.ProxyTex[TEXTURE_2D_MULTISAMPLE_INDEX] : NULL;
> + case GL_TEXTURE_2D_MULTISAMPLE_ARRAY:
> + return ctx->Extensions.ARB_texture_multisample
> + ? texUnit->CurrentTex[TEXTURE_2D_MULTISAMPLE_ARRAY_INDEX] : NULL;
> + case GL_PROXY_TEXTURE_2D_MULTISAMPLE_ARRAY:
> + return ctx->Extensions.ARB_texture_multisample
> + ? ctx->Texture.ProxyTex[TEXTURE_2D_MULTISAMPLE_ARRAY_INDEX] : NULL;
> default:
> _mesa_problem(NULL, "bad target in _mesa_select_tex_object()");
> return NULL;
> @@ -927,6 +947,16 @@ get_proxy_tex_image(struct gl_context *ctx, GLenum target, GLint level)
> return NULL;
> texIndex = TEXTURE_CUBE_ARRAY_INDEX;
> break;
> + case GL_PROXY_TEXTURE_2D_MULTISAMPLE:
> + if (level> 0)
> + return 0;
> + texIndex = TEXTURE_2D_MULTISAMPLE_INDEX;
> + break;
> + case GL_PROXY_TEXTURE_2D_MULTISAMPLE_ARRAY:
> + if (level> 0)
> + return 0;
> + texIndex = TEXTURE_2D_MULTISAMPLE_ARRAY_INDEX;
> + break;
> default:
> return NULL;
> }
> @@ -996,6 +1026,13 @@ _mesa_max_texture_levels(struct gl_context *ctx, GLenum target)
> case GL_TEXTURE_BUFFER:
> return ctx->API == API_OPENGL_CORE&&
> ctx->Extensions.ARB_texture_buffer_object ? 1 : 0;
> + case GL_TEXTURE_2D_MULTISAMPLE:
> + case GL_PROXY_TEXTURE_2D_MULTISAMPLE:
> + case GL_TEXTURE_2D_MULTISAMPLE_ARRAY:
> + case GL_PROXY_TEXTURE_2D_MULTISAMPLE_ARRAY:
> + return _mesa_is_desktop_gl(ctx)
> +&& ctx->Extensions.ARB_texture_multisample
> + ? 1 : 0;
> case GL_TEXTURE_EXTERNAL_OES:
> /* fall-through */
> default:
> @@ -1029,6 +1066,8 @@ _mesa_get_texture_dimensions(GLenum target)
> case GL_TEXTURE_1D_ARRAY:
> case GL_PROXY_TEXTURE_1D_ARRAY:
> case GL_TEXTURE_EXTERNAL_OES:
> + case GL_TEXTURE_2D_MULTISAMPLE:
> + case GL_PROXY_TEXTURE_2D_MULTISAMPLE:
> return 2;
> case GL_TEXTURE_3D:
> case GL_PROXY_TEXTURE_3D:
> @@ -1036,6 +1075,8 @@ _mesa_get_texture_dimensions(GLenum target)
> case GL_PROXY_TEXTURE_2D_ARRAY:
> case GL_TEXTURE_CUBE_MAP_ARRAY:
> case GL_PROXY_TEXTURE_CUBE_MAP_ARRAY:
> + case GL_TEXTURE_2D_MULTISAMPLE_ARRAY:
> + case GL_PROXY_TEXTURE_2D_MULTISAMPLE_ARRAY:
> return 3;
> case GL_TEXTURE_BUFFER:
> /* fall-through */
> @@ -1077,6 +1118,8 @@ _mesa_get_tex_max_num_levels(GLenum target, GLsizei width, GLsizei height,
> break;
> case GL_TEXTURE_RECTANGLE:
> case GL_TEXTURE_EXTERNAL_OES:
> + case GL_TEXTURE_2D_MULTISAMPLE:
> + case GL_TEXTURE_2D_MULTISAMPLE_ARRAY:
> return 1;
> default:
> assert(0);
> @@ -1243,6 +1286,8 @@ _mesa_init_teximage_fields(struct gl_context *ctx,
> case GL_PROXY_TEXTURE_2D:
> case GL_PROXY_TEXTURE_RECTANGLE:
> case GL_PROXY_TEXTURE_CUBE_MAP:
> + case GL_TEXTURE_2D_MULTISAMPLE:
> + case GL_PROXY_TEXTURE_2D_MULTISAMPLE:
> img->Height2 = height - 2 * border; /* == 1<< img->HeightLog2; */
> img->HeightLog2 = _mesa_logbase2(img->Height2);
> if (depth == 0)
> @@ -1255,6 +1300,8 @@ _mesa_init_teximage_fields(struct gl_context *ctx,
> case GL_PROXY_TEXTURE_2D_ARRAY:
> case GL_TEXTURE_CUBE_MAP_ARRAY:
> case GL_PROXY_TEXTURE_CUBE_MAP_ARRAY:
> + case GL_TEXTURE_2D_MULTISAMPLE_ARRAY:
> + case GL_PROXY_TEXTURE_2D_MULTISAMPLE_ARRAY:
> img->Height2 = height - 2 * border; /* == 1<< img->HeightLog2; */
> img->HeightLog2 = _mesa_logbase2(img->Height2);
> img->Depth2 = depth; /* no border */
> @@ -1326,6 +1373,8 @@ _mesa_legal_texture_dimensions(struct gl_context *ctx, GLenum target,
>
> case GL_TEXTURE_2D:
> case GL_PROXY_TEXTURE_2D:
> + case GL_TEXTURE_2D_MULTISAMPLE:
> + case GL_PROXY_TEXTURE_2D_MULTISAMPLE:
> maxSize = 1<< (ctx->Const.MaxTextureLevels - 1);
> maxSize>>= level;
> if (width< 2 * border || width> 2 * border + maxSize)
> @@ -1408,6 +1457,8 @@ _mesa_legal_texture_dimensions(struct gl_context *ctx, GLenum target,
>
> case GL_TEXTURE_2D_ARRAY_EXT:
> case GL_PROXY_TEXTURE_2D_ARRAY_EXT:
> + case GL_TEXTURE_2D_MULTISAMPLE_ARRAY:
> + case GL_PROXY_TEXTURE_2D_MULTISAMPLE_ARRAY:
> maxSize = 1<< (ctx->Const.MaxTextureLevels - 1);
> maxSize>>= level;
> if (width< 2 * border || width> 2 * border + maxSize)
> diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c
> index cb7ac19..4173a7f 100644
> --- a/src/mesa/main/texobj.c
> +++ b/src/mesa/main/texobj.c
> @@ -109,7 +109,9 @@ _mesa_initialize_texture_object( struct gl_texture_object *obj,
> target == GL_TEXTURE_2D_ARRAY_EXT ||
> target == GL_TEXTURE_EXTERNAL_OES ||
> target == GL_TEXTURE_CUBE_MAP_ARRAY ||
> - target == GL_TEXTURE_BUFFER);
> + target == GL_TEXTURE_BUFFER ||
> + target == GL_TEXTURE_2D_MULTISAMPLE ||
> + target == GL_TEXTURE_2D_MULTISAMPLE_ARRAY);
>
> memset(obj, 0, sizeof(*obj));
> /* init the non-zero fields */
> @@ -318,6 +320,8 @@ valid_texture_object(const struct gl_texture_object *tex)
> case GL_TEXTURE_BUFFER:
> case GL_TEXTURE_EXTERNAL_OES:
> case GL_TEXTURE_CUBE_MAP_ARRAY:
> + case GL_TEXTURE_2D_MULTISAMPLE:
> + case GL_TEXTURE_2D_MULTISAMPLE_ARRAY:
> return GL_TRUE;
> case 0x99:
> _mesa_problem(NULL, "invalid reference to a deleted texture object");
> @@ -517,6 +521,8 @@ _mesa_test_texobj_completeness( const struct gl_context *ctx,
> case GL_TEXTURE_RECTANGLE_NV:
> case GL_TEXTURE_BUFFER:
> case GL_TEXTURE_EXTERNAL_OES:
> + case GL_TEXTURE_2D_MULTISAMPLE:
> + case GL_TEXTURE_2D_MULTISAMPLE_ARRAY:
> maxLevels = 1; /* no mipmapping */
> break;
> default:
> @@ -585,7 +591,8 @@ _mesa_test_texobj_completeness( const struct gl_context *ctx,
> height = baseImage->Height2;
> depth = baseImage->Depth2;
>
> - /* Note: this loop will be a no-op for RECT, BUFFER, EXTERNAL textures */
> + /* Note: this loop will be a no-op for RECT, BUFFER, EXTERNAL,
> + * MULTISAMPLE and MULTISAMPLE_ARRAY textures */
The indentation looks a bit off there (mixed tabs and spaces?). And
we normally close multi-line comments with the */ on a line by itself.
Ex:
/* Note: this loop will be a no-op for RECT, BUFFER, EXTERNAL,
* MULTISAMPLE and MULTISAMPLE_ARRAY textures.
*/
Same thing in a few of the other patches.
-Brian
More information about the mesa-dev
mailing list