fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 17:30:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mesa: partially skip glPush/PopAttrib for MSAA textures and texture buffers

Browse source 
This is based on the GL 4.6 Compatibility profile spec. Some fields just
don't have to be restored. This decreases CPU overhead.

Reviewed-by: Zoltán Böszörményi <zboszor@gmail.com>
Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8181>
This commit is contained in:
Marek Olšák 2020-12-19 03:21:25 -05:00
parent 68030bbf73
commit 8706e97ffd
1 changed files with 32 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/mesa/main/attrib.c
View file

@ -63,6 +63,26 @@
#include "util/u_memory.h"
static inline bool
copy_texture_attribs(struct gl_texture_object *dst,
const struct gl_texture_object *src,
gl_texture_index tex)
{
/* All pushed fields have no effect on texture buffers. */
if (tex == TEXTURE_BUFFER_INDEX)
return false;
/* Sampler fields have no effect on MSAA textures. */
if (tex != TEXTURE_2D_MULTISAMPLE_INDEX &&
tex != TEXTURE_2D_MULTISAMPLE_ARRAY_INDEX) {
memcpy(&dst->Sampler.Attrib, &src->Sampler.Attrib,
sizeof(src->Sampler.Attrib));
}
memcpy(&dst->Attrib, &src->Attrib, sizeof(src->Attrib));
return true;
}
void GLAPIENTRY
_mesa_PushAttrib(GLbitfield mask)
{
@ -251,8 +271,8 @@ _mesa_PushAttrib(GLbitfield mask)
struct gl_texture_object *src = ctx->Texture.Unit[u].CurrentTex[tex];
dst->Name = src->Name;
memcpy(&dst->Sampler.Attrib, &src->Sampler.Attrib, sizeof(src->Sampler.Attrib));
memcpy(&dst->Attrib, &src->Attrib, sizeof(src->Attrib));
copy_texture_attribs(dst, src, tex);
}
}
@ -594,8 +614,15 @@ pop_texture_group(struct gl_context *ctx, struct gl_texture_attrib_node *texstat
const struct gl_texture_object *savedObj = &texstate->SavedObj[u][tgt];
struct gl_texture_object *texObj =
_mesa_get_tex_unit(ctx, u)->CurrentTex[tgt];
bool is_msaa = tgt == TEXTURE_2D_MULTISAMPLE_INDEX ||
tgt == TEXTURE_2D_MULTISAMPLE_ARRAY_INDEX;
if (texObj->Name != savedObj->Name) {
/* According to the OpenGL 4.6 Compatibility Profile specification,
* table 23.17, GL_TEXTURE_BINDING_2D_MULTISAMPLE and
* GL_TEXTURE_BINDING_2D_MULTISAMPLE_ARRAY do not belong in the
* texture attrib group.
*/
if (!is_msaa && texObj->Name != savedObj->Name) {
/* We don't need to check whether the texture target is supported,
* because we wouldn't get in this conditional block if it wasn't.
*/
@ -603,9 +630,8 @@ pop_texture_group(struct gl_context *ctx, struct gl_texture_attrib_node *texstat
texObj = _mesa_get_tex_unit(ctx, u)->CurrentTex[tgt];
}
memcpy(&texObj->Sampler.Attrib, &savedObj->Sampler.Attrib,
sizeof(savedObj->Sampler.Attrib));
memcpy(&texObj->Attrib, &savedObj->Attrib, sizeof(savedObj->Attrib));
if (!copy_texture_attribs(texObj, savedObj, tgt))
continue;
/* GL_ALL_ATTRIB_BITS means all pnames. (internal) */
if (texObj->Name != 0 && ctx->Driver.TexParameter)