<div dir="ltr">Correct and I check_multisample_target checks for that.<div>And we never get to this code if using a PROXY target.</div><div>Or did I miss something?</div></div><div class="gmail_extra"> <div class="gmail_quote"> On Wed, Nov 6, 2013 at 1:14 PM, Chris Forbes <<a href="mailto:chrisf@ijw.co.nz" target="_blank">chrisf@ijw.co.nz</a>> wrote: <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> The only interesting targets in teximagemultisample are GL_TEXTURE_2D_MULTISAMPLE and GL_TEXTURE_2D_MULTISAMPLE_ARRAY. <div class="HOEnZb"><div class="h5"> On Thu, Nov 7, 2013 at 8:55 AM, Courtney Goeltzenleuchter <<a href="mailto:courtney@lunarg.com">courtney@lunarg.com</a>> wrote: > TexStorage and TexStorageMultisample updates texture object > state needed by ARB_texture_view extension. > > Set appropriate TextureView state in texture object. > > mesa: Add ARB_texture_view > > Signed-off-by: Courtney Goeltzenleuchter <courtney@LunarG.com> > --- > src/mesa/main/teximage.c | 38 ++++++++++++++++++++++++++++++++++++++ > src/mesa/main/texstorage.c | 33 +++++++++++++++++++++++++++++++++ > 2 files changed, 71 insertions(+) > > diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c > index 793c5d3..c01f72e 100644 > --- a/src/mesa/main/teximage.c > +++ b/src/mesa/main/teximage.c > @@ -4348,6 +4348,44 @@ teximagemultisample(GLuint dims, GLenum target, GLsizei samples, > } > > texObj->Immutable = immutable; > + > + if (immutable) { > + /* If the command is successful, > + * TEXTURE_IMMUTABLE_FORMAT becomes TRUE. > + * TEXTURE_IMMUTABLE_LEVELS and TEXTURE_VIEW_NUM_LEVELS become levels. > + * If the texture target is TEXTURE_1D_ARRAY then > + * TEXTURE_VIEW_NUM_LAYERS becomes height. > + * If the texture target is TEXTURE_2D_ARRAY, TEXTURE_CUBE_MAP_ARRAY, > + * or TEXTURE_2D_MULTISAMPLE_ARRAY then TEXTURE_VIEW_NUM_LAYERS becomes depth. > + * If the texture target is TEXTURE_CUBE_MAP, then > + * TEXTURE_VIEW_NUM_LAYERS becomes 6. > + * For any other texture target, TEXTURE_VIEW_NUM_LAYERS becomes 1. > + * ARB_texture_multisample: Multisample textures do > + * not have multiple image levels. > + */ > + texObj->Immutable = GL_TRUE; > + texObj->ImmutableLevels = 1; > + texObj->MinLevel = 0; > + texObj->NumLevels = 1; > + texObj->MinLayer = 0; > + texObj->NumLayers = 1; > + switch (target) { > + case GL_TEXTURE_1D_ARRAY: > + texObj->NumLayers = height; > + break; > + > + case GL_TEXTURE_2D_ARRAY: > + case GL_TEXTURE_CUBE_MAP_ARRAY: > + case GL_TEXTURE_2D_MULTISAMPLE_ARRAY: > + texObj->NumLayers = depth; > + break; > + > + case GL_TEXTURE_CUBE_MAP: > + texObj->NumLayers = 6; > + break; > + } > + } > + > _mesa_update_fbo_texture(ctx, texObj, 0, 0); > } > } > diff --git a/src/mesa/main/texstorage.c b/src/mesa/main/texstorage.c > index 84b8f82..4da3c91 100644 > --- a/src/mesa/main/texstorage.c > +++ b/src/mesa/main/texstorage.c > @@ -436,8 +436,41 @@ texstorage(GLuint dims, GLenum target, GLsizei levels, GLenum internalformat, > return; > } > > + /* If the command is successful, > + * TEXTURE_IMMUTABLE_FORMAT becomes TRUE. > + * TEXTURE_IMMUTABLE_LEVELS and TEXTURE_VIEW_NUM_LEVELS become levels. > + * If the texture target is TEXTURE_1D_ARRAY then > + * TEXTURE_VIEW_NUM_LAYERS becomes height. > + * If the texture target is TEXTURE_2D_ARRAY, TEXTURE_CUBE_MAP_ARRAY, > + * or TEXTURE_2D_MULTISAMPLE_ARRAY then TEXTURE_VIEW_NUM_LAYERS becomes depth. > + * If the texture target is TEXTURE_CUBE_MAP, then > + * TEXTURE_VIEW_NUM_LAYERS becomes 6. > + * For any other texture target, TEXTURE_VIEW_NUM_LAYERS becomes 1. > + */ > + > texObj->Immutable = GL_TRUE; > texObj->ImmutableLevels = levels; > + texObj->MinLevel = 0; > + texObj->NumLevels = levels; > + texObj->MinLayer = 0; > + texObj->NumLayers = 1; > + switch (target) > + { > + case GL_TEXTURE_1D_ARRAY: > + texObj->NumLayers = height; > + break; > + > + case GL_TEXTURE_2D_ARRAY: > + case GL_TEXTURE_CUBE_MAP_ARRAY: > + case GL_TEXTURE_2D_MULTISAMPLE_ARRAY: > + texObj->NumLayers = depth; > + break; > + > + case GL_TEXTURE_CUBE_MAP: > + texObj->NumLayers = 6; > + break; > + } > + > } > } > > -- > 1.8.1.2 > </div></div><div class="HOEnZb"><div class="h5">> _______________________________________________ > mesa-dev mailing list > <a href="mailto:mesa-dev@lists.freedesktop.org">mesa-dev@lists.freedesktop.org</a> > <a href="http://lists.freedesktop.org/mailman/listinfo/mesa-dev" target="_blank">http://lists.freedesktop.org/mailman/listinfo/mesa-dev</a> </div></div></blockquote></div> <div> </div>-- <div dir="ltr">Courtney Goeltzenleuchter <div>LunarG</div><div><img src="http://media.lunarg.com/wp-content/themes/LunarG/images/logo.png" width="96" height="65"> </div></div> </div>