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

intel: Pass the gl_renderbuffer to render_target_supported() vtable method.

Browse source 
I'm going to want to go looking at it for an integer texture fix.

NOTE: This is a candidate for the 8.0 branch.
This commit is contained in:
Eric Anholt 2012-01-19 17:23:25 -08:00
parent 7cac88679b
commit 796f44d779
7 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/mesa/drivers/dri/i915/i830_vtbl.c
View file

@ -592,8 +592,11 @@ static uint32_t i830_render_target_format_for_mesa_format[MESA_FORMAT_COUNT] =
};
static bool
i830_render_target_supported(struct intel_context *intel, gl_format format)
i830_render_target_supported(struct intel_context *intel,
struct gl_renderbuffer *rb)
{
gl_format format = rb->Format;
if (format == MESA_FORMAT_S8_Z24 ||
format == MESA_FORMAT_X8_Z24 ||
format == MESA_FORMAT_Z16) {

5
src/mesa/drivers/dri/i915/i915_vtbl.c
View file

@ -557,8 +557,11 @@ static uint32_t i915_render_target_format_for_mesa_format[MESA_FORMAT_COUNT] =
};
static bool
i915_render_target_supported(struct intel_context *intel, gl_format format)
i915_render_target_supported(struct intel_context *intel,
struct gl_renderbuffer *rb)
{
gl_format format = rb->Format;
if (format == MESA_FORMAT_S8_Z24 ||
format == MESA_FORMAT_X8_Z24 ||
format == MESA_FORMAT_Z16) {

3
src/mesa/drivers/dri/i965/brw_wm.h
View file

@ -472,7 +472,8 @@ struct gl_shader *brw_new_shader(struct gl_context *ctx, GLuint name, GLuint typ
struct gl_shader_program *brw_new_shader_program(struct gl_context *ctx, GLuint name);
bool brw_color_buffer_write_enabled(struct brw_context *brw);
bool brw_render_target_supported(struct intel_context *intel, gl_format format);
bool brw_render_target_supported(struct intel_context *intel,
struct gl_renderbuffer *rb);
void brw_wm_payload_setup(struct brw_context *brw,
struct brw_wm_compile *c);
bool do_wm_prog(struct brw_context *brw,

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

@ -557,12 +557,12 @@ brw_init_surface_formats(struct brw_context *brw)
}
bool
brw_render_target_supported(struct intel_context *intel, gl_format format)
brw_render_target_supported(struct intel_context *intel,
struct gl_renderbuffer *rb)
{
struct brw_context *brw = brw_context(&intel->ctx);
/* Not exactly true, as some of those formats are not renderable.
* But at least we know how to translate them.
*/
gl_format format = rb->Format;
return brw->format_supported_as_render_target[format];
}

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

@ -221,7 +221,7 @@ gen7_update_renderbuffer_surface(struct brw_context *brw,
surf->ss0.surface_format = BRW_SURFACEFORMAT_B8G8R8A8_UNORM;
break;
default:
assert(brw_render_target_supported(intel, rb_format));
assert(brw_render_target_supported(intel, rb));
surf->ss0.surface_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",

2
src/mesa/drivers/dri/intel/intel_context.h
View file

@ -153,7 +153,7 @@ struct intel_context
void (*debug_batch)(struct intel_context *intel);
bool (*render_target_supported)(struct intel_context *intel,
gl_format format);
struct gl_renderbuffer *rb);
/** Can HiZ be enabled on a depthbuffer of the given format? */
bool (*is_hiz_depth_format)(struct intel_context *intel,

2
src/mesa/drivers/dri/intel/intel_fbo.c
View file

@ -769,7 +769,7 @@ intel_validate_framebuffer(struct gl_context *ctx, struct gl_framebuffer *fb)
continue;
}
if (!intel->vtbl.render_target_supported(intel, intel_rb_format(irb))) {
if (!intel->vtbl.render_target_supported(intel, rb)) {
DBG("Unsupported HW texture/renderbuffer format attached: %s\n",
_mesa_get_format_name(intel_rb_format(irb)));
fb->_Status = GL_FRAMEBUFFER_UNSUPPORTED_EXT;