fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-06 07:18:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mesa: Make a Mesa core function for sRGB render encoding handling.

Browse source 
v2: const-qualify ctx, and add a comment about the function (recommended
    by Brian and Kenneth).

Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> (v1)
This commit is contained in:
Eric Anholt 2013-04-18 09:20:55 -07:00
parent db31bc5cfb
commit e34c857639
4 changed files with 36 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/mesa/drivers/dri/i965/brw_wm_surface_state.c
View file

@ -31,6 +31,7 @@
#include "main/context.h"
#include "main/blend.h"
#include "main/mtypes.h"
#include "main/samplerobj.h"
#include "program/prog_parameter.h"
@ -1229,7 +1230,8 @@ brw_update_renderbuffer_surface(struct brw_context *brw,
uint32_t *surf;
uint32_t tile_x, tile_y;
uint32_t format = 0;
gl_format rb_format = intel_rb_format(irb);
/* _NEW_BUFFERS */
gl_format rb_format = _mesa_get_render_format(ctx, intel_rb_format(irb));
if (irb->tex_image && !brw->has_surface_tile_offset) {
intel_renderbuffer_tile_offsets(irb, &tile_x, &tile_y);
@ -1251,25 +1253,10 @@ brw_update_renderbuffer_surface(struct brw_context *brw,
surf = brw_state_batch(brw, AUB_TRACE_SURFACE_STATE,
6 * 4, 32, &brw->wm.surf_offset[unit]);
switch (rb_format) {
case MESA_FORMAT_SARGB8:
/* _NEW_BUFFERS
*
* Without GL_EXT_framebuffer_sRGB we shouldn't bind sRGB surfaces to the
* blend/update as sRGB.
*/
if (ctx->Color.sRGBEnabled)
format = brw_format_for_mesa_format(rb_format);
else
format = BRW_SURFACEFORMAT_B8G8R8A8_UNORM;
break;
default:
format = brw->render_target_format[rb_format];
if (unlikely(!brw->format_supported_as_render_target[rb_format])) {
_mesa_problem(ctx, "%s: renderbuffer format %s unsupported\n",
__FUNCTION__, _mesa_get_format_name(rb_format));
}
break;
format = brw->render_target_format[rb_format];
if (unlikely(!brw->format_supported_as_render_target[rb_format])) {
_mesa_problem(ctx, "%s: renderbuffer format %s unsupported\n",
__FUNCTION__, _mesa_get_format_name(rb_format));
}
surf[0] = (BRW_SURFACE_2D << BRW_SURFACE_TYPE_SHIFT |

29
src/mesa/drivers/dri/i965/gen7_wm_surface_state.c
View file

@ -21,6 +21,7 @@
* IN THE SOFTWARE.
*/
#include "main/mtypes.h"
#include "main/blend.h"
#include "main/samplerobj.h"
#include "program/prog_parameter.h"
@ -529,7 +530,8 @@ gen7_update_renderbuffer_surface(struct brw_context *brw,
struct intel_region *region = irb->mt->region;
uint32_t tile_x, tile_y;
uint32_t format;
gl_format rb_format = intel_rb_format(irb);
/* _NEW_BUFFERS */
gl_format rb_format = _mesa_get_render_format(ctx, intel_rb_format(irb));
uint32_t *surf = brw_state_batch(brw, AUB_TRACE_SURFACE_STATE,
8 * 4, 32, &brw->wm.surf_offset[unit]);
@ -538,26 +540,11 @@ gen7_update_renderbuffer_surface(struct brw_context *brw,
/* Render targets can't use IMS layout */
assert(irb->mt->msaa_layout != INTEL_MSAA_LAYOUT_IMS);
switch (rb_format) {
case MESA_FORMAT_SARGB8:
/* _NEW_BUFFERS
*
* Without GL_EXT_framebuffer_sRGB we shouldn't bind sRGB surfaces to the
* blend/update as sRGB.
*/
if (ctx->Color.sRGBEnabled)
format = brw_format_for_mesa_format(rb_format);
else
format = BRW_SURFACEFORMAT_B8G8R8A8_UNORM;
break;
default:
assert(brw_render_target_supported(intel, rb));
format = brw->render_target_format[rb_format];
if (unlikely(!brw->format_supported_as_render_target[rb_format])) {
_mesa_problem(ctx, "%s: renderbuffer format %s unsupported\n",
__FUNCTION__, _mesa_get_format_name(rb_format));
}
break;
assert(brw_render_target_supported(intel, rb));
format = brw->render_target_format[rb_format];
if (unlikely(!brw->format_supported_as_render_target[rb_format])) {
_mesa_problem(ctx, "%s: renderbuffer format %s unsupported\n",
__FUNCTION__, _mesa_get_format_name(rb_format));
}
surf[0] = BRW_SURFACE_2D << BRW_SURFACE_TYPE_SHIFT |

17
src/mesa/main/blend.c
View file

@ -856,6 +856,23 @@ _mesa_update_clamp_vertex_color(struct gl_context *ctx)
ctx->Light._ClampVertexColor = _mesa_get_clamp_vertex_color(ctx);
}
/**
* Returns an appropriate gl_format for color rendering based on the
* GL_FRAMEBUFFER_SRGB state.
*
* Some drivers implement GL_FRAMEBUFFER_SRGB using a flag on the blend state
* (which GL_FRAMEBUFFER_SRGB maps to reasonably), but some have to do so by
* overriding the format of the surface. This is a helper for doing the
* surface format override variant.
*/
gl_format
_mesa_get_render_format(const struct gl_context *ctx, gl_format format)
{
if (ctx->Color.sRGBEnabled)
return format;
else
return _mesa_get_srgb_format_linear(format);
}
/**********************************************************************/
/** \name Initialization */

4
src/mesa/main/blend.h
View file

@ -35,6 +35,7 @@
#include "glheader.h"
#include "formats.h"
struct gl_context;
@ -115,6 +116,9 @@ _mesa_update_clamp_fragment_color(struct gl_context *ctx);
extern void
_mesa_update_clamp_vertex_color(struct gl_context *ctx);
extern gl_format
_mesa_get_render_format(const struct gl_context *ctx, gl_format format);
extern void
_mesa_init_color( struct gl_context * ctx );