brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cogl: Remove debug disables for GLSL and NPOT textures

Browse Source 
https://gitlab.gnome.org/GNOME/mutter/merge_requests/546
This commit is contained in:
Adam Jackson 2019-03-08 15:33:39 -05:00
parent 249f9a4a2e
commit 2aaed7bdfc
4 changed files with 0 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
cogl/cogl/cogl-context.c
View File

@ -105,30 +105,6 @@ _cogl_init_feature_overrides (CoglContext *ctx)
if (G_UNLIKELY (COGL_DEBUG_ENABLED (COGL_DEBUG_DISABLE_PBOS))) if (G_UNLIKELY (COGL_DEBUG_ENABLED (COGL_DEBUG_DISABLE_PBOS)))
COGL_FLAGS_SET (ctx->private_features, COGL_PRIVATE_FEATURE_PBOS, FALSE); COGL_FLAGS_SET (ctx->private_features, COGL_PRIVATE_FEATURE_PBOS, FALSE);
if (G_UNLIKELY (COGL_DEBUG_ENABLED (COGL_DEBUG_DISABLE_GLSL)))
{
ctx->feature_flags &= ~COGL_FEATURE_SHADERS_GLSL;
COGL_FLAGS_SET (ctx->features, COGL_FEATURE_ID_GLSL, FALSE);
COGL_FLAGS_SET (ctx->features,
COGL_FEATURE_ID_PER_VERTEX_POINT_SIZE,
FALSE);
}
if (G_UNLIKELY (COGL_DEBUG_ENABLED (COGL_DEBUG_DISABLE_NPOT_TEXTURES)))
{
ctx->feature_flags &= ~(COGL_FEATURE_TEXTURE_NPOT |
COGL_FEATURE_TEXTURE_NPOT_BASIC |
COGL_FEATURE_TEXTURE_NPOT_MIPMAP |
COGL_FEATURE_TEXTURE_NPOT_REPEAT);
COGL_FLAGS_SET (ctx->features, COGL_FEATURE_ID_TEXTURE_NPOT, FALSE);
COGL_FLAGS_SET (ctx->features,
COGL_FEATURE_ID_TEXTURE_NPOT_BASIC, FALSE);
COGL_FLAGS_SET (ctx->features,
COGL_FEATURE_ID_TEXTURE_NPOT_MIPMAP, FALSE);
COGL_FLAGS_SET (ctx->features,
COGL_FEATURE_ID_TEXTURE_NPOT_REPEAT, FALSE);
}
} }
const CoglWinsysVtable * const CoglWinsysVtable *

11
cogl/cogl/cogl-debug-options.h
View File

@ -130,22 +130,11 @@ OPT (DISABLE_TEXTURING,
"disable-texturing", "disable-texturing",
N_("Disable texturing"), N_("Disable texturing"),
N_("Disable texturing any primitives")) N_("Disable texturing any primitives"))
OPT (DISABLE_GLSL,
N_("Root Cause"),
"disable-glsl",
N_("Disable GLSL"),
N_("Disable use of GLSL"))
OPT (DISABLE_BLENDING, OPT (DISABLE_BLENDING,
N_("Root Cause"), N_("Root Cause"),
"disable-blending", "disable-blending",
N_("Disable blending"), N_("Disable blending"),
N_("Disable use of blending")) N_("Disable use of blending"))
OPT (DISABLE_NPOT_TEXTURES,
N_("Root Cause"),
"disable-npot-textures",
N_("Disable non-power-of-two textures"),
N_("Makes Cogl think that the GL driver doesn't support NPOT textures "
"so that it will create sliced textures or textures with waste instead."))
OPT (DISABLE_SOFTWARE_CLIP, OPT (DISABLE_SOFTWARE_CLIP,
N_("Root Cause"), N_("Root Cause"),
"disable-software-clip", "disable-software-clip",

2
cogl/cogl/cogl-debug.c
View File

@ -77,9 +77,7 @@ static const GDebugKey cogl_behavioural_debug_keys[] = {
{ "disable-atlas", COGL_DEBUG_DISABLE_ATLAS }, { "disable-atlas", COGL_DEBUG_DISABLE_ATLAS },
{ "disable-shared-atlas", COGL_DEBUG_DISABLE_SHARED_ATLAS }, { "disable-shared-atlas", COGL_DEBUG_DISABLE_SHARED_ATLAS },
{ "disable-texturing", COGL_DEBUG_DISABLE_TEXTURING}, { "disable-texturing", COGL_DEBUG_DISABLE_TEXTURING},
{ "disable-glsl", COGL_DEBUG_DISABLE_GLSL},
{ "disable-blending", COGL_DEBUG_DISABLE_BLENDING}, { "disable-blending", COGL_DEBUG_DISABLE_BLENDING},
{ "disable-npot-textures", COGL_DEBUG_DISABLE_NPOT_TEXTURES},
{ "wireframe", COGL_DEBUG_WIREFRAME}, { "wireframe", COGL_DEBUG_WIREFRAME},
{ "disable-software-clip", COGL_DEBUG_DISABLE_SOFTWARE_CLIP}, { "disable-software-clip", COGL_DEBUG_DISABLE_SOFTWARE_CLIP},
{ "disable-program-caches", COGL_DEBUG_DISABLE_PROGRAM_CACHES}, { "disable-program-caches", COGL_DEBUG_DISABLE_PROGRAM_CACHES},

2
cogl/cogl/cogl-debug.h
View File

@ -61,12 +61,10 @@ typedef enum
COGL_DEBUG_DISABLE_SHARED_ATLAS, COGL_DEBUG_DISABLE_SHARED_ATLAS,
COGL_DEBUG_OPENGL, COGL_DEBUG_OPENGL,
COGL_DEBUG_DISABLE_TEXTURING, COGL_DEBUG_DISABLE_TEXTURING,
COGL_DEBUG_DISABLE_GLSL,
COGL_DEBUG_SHOW_SOURCE, COGL_DEBUG_SHOW_SOURCE,
COGL_DEBUG_DISABLE_BLENDING, COGL_DEBUG_DISABLE_BLENDING,
COGL_DEBUG_TEXTURE_PIXMAP, COGL_DEBUG_TEXTURE_PIXMAP,
COGL_DEBUG_BITMAP, COGL_DEBUG_BITMAP,
COGL_DEBUG_DISABLE_NPOT_TEXTURES,
COGL_DEBUG_WIREFRAME, COGL_DEBUG_WIREFRAME,
COGL_DEBUG_DISABLE_SOFTWARE_CLIP, COGL_DEBUG_DISABLE_SOFTWARE_CLIP,
COGL_DEBUG_DISABLE_PROGRAM_CACHES, COGL_DEBUG_DISABLE_PROGRAM_CACHES,