OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa: remove ctx->Const.sRGBCapable

Browse Source 
It always had the same value as ctx->Extensions.EXT_framebuffer_sRGB.

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Marek Olšák
2012-01-24 23:39:31 +01:00
parent 8ec05f06cb
commit 69c8f468ba
6 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/mesa/drivers/dri/intel/intel_context.c
View File

@@ -697,7 +697,6 @@ intelInitContext(struct intel_context *intel,
_mesa_init_point(ctx); _mesa_init_point(ctx);
if (intel->gen >= 4) { if (intel->gen >= 4) {
ctx->Const.sRGBCapable = true;
if (MAX_WIDTH > 8192) if (MAX_WIDTH > 8192)
ctx->Const.MaxRenderbufferSize = 8192; ctx->Const.MaxRenderbufferSize = 8192;
} else { } else {

2
src/mesa/main/fbobject.c
View File

@@ -2405,7 +2405,7 @@ _mesa_GetFramebufferAttachmentParameterivEXT(GLenum target, GLenum attachment,
"glGetFramebufferAttachmentParameterivEXT(pname)"); "glGetFramebufferAttachmentParameterivEXT(pname)");
} }
else { else {
if (ctx->Extensions.EXT_framebuffer_sRGB && ctx->Const.sRGBCapable) { if (ctx->Extensions.EXT_framebuffer_sRGB) {
*params = _mesa_get_format_color_encoding(att->Renderbuffer->Format); *params = _mesa_get_format_color_encoding(att->Renderbuffer->Format);
} }
else { else {

2
src/mesa/main/framebuffer.c
View File

@@ -527,7 +527,7 @@ _mesa_update_framebuffer_visual(struct gl_context *ctx,
fb->Visual.samples = rb->NumSamples; fb->Visual.samples = rb->NumSamples;
fb->Visual.sampleBuffers = rb->NumSamples > 0 ? 1 : 0; fb->Visual.sampleBuffers = rb->NumSamples > 0 ? 1 : 0;
if (_mesa_get_format_color_encoding(fmt) == GL_SRGB) if (_mesa_get_format_color_encoding(fmt) == GL_SRGB)
fb->Visual.sRGBCapable = ctx->Const.sRGBCapable; fb->Visual.sRGBCapable = ctx->Extensions.EXT_framebuffer_sRGB;
break; break;
} }
} }

3
src/mesa/main/mtypes.h
View File

@@ -2808,9 +2808,6 @@ struct gl_constants
/** GL_EXT_gpu_shader4 */ /** GL_EXT_gpu_shader4 */
GLint MinProgramTexelOffset, MaxProgramTexelOffset; GLint MinProgramTexelOffset, MaxProgramTexelOffset;
/* GL_EXT_framebuffer_sRGB */
GLboolean sRGBCapable; /* can enable sRGB blend/update on FBOs */
/* GL_ARB_robustness */ /* GL_ARB_robustness */
GLenum ResetStrategy; GLenum ResetStrategy;

2
src/mesa/state_tracker/st_cb_fbo.c
View File

@@ -471,7 +471,7 @@ st_validate_attachment(struct gl_context *ctx,
/* If the encoding is sRGB and sRGB rendering cannot be enabled, /* If the encoding is sRGB and sRGB rendering cannot be enabled,
* check for linear format support instead. * check for linear format support instead.
* Later when we create a surface, we change the format to a linear one. */ * Later when we create a surface, we change the format to a linear one. */
if (!ctx->Const.sRGBCapable && if (!ctx->Extensions.EXT_framebuffer_sRGB &&
_mesa_get_format_color_encoding(texFormat) == GL_SRGB) { _mesa_get_format_color_encoding(texFormat) == GL_SRGB) {
const gl_format linearFormat = _mesa_get_srgb_format_linear(texFormat); const gl_format linearFormat = _mesa_get_srgb_format_linear(texFormat);
format = st_mesa_format_to_pipe_format(linearFormat); format = st_mesa_format_to_pipe_format(linearFormat);

1
src/mesa/state_tracker/st_extensions.c
View File

@@ -425,7 +425,6 @@ void st_init_extensions(struct st_context *st)
PIPE_TEXTURE_2D, 0, PIPE_TEXTURE_2D, 0,
PIPE_BIND_RENDER_TARGET)) { PIPE_BIND_RENDER_TARGET)) {
ctx->Extensions.EXT_framebuffer_sRGB = GL_TRUE; ctx->Extensions.EXT_framebuffer_sRGB = GL_TRUE;
ctx->Const.sRGBCapable = GL_TRUE;
} }
} }