projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
i965/blorp: Mark branch unreachable to silence uninitialized var warning.
[mesa.git]
/
src
/
mesa
/
drivers
/
dri
/
i965
/
brw_blorp_clear.cpp
diff --git
a/src/mesa/drivers/dri/i965/brw_blorp_clear.cpp
b/src/mesa/drivers/dri/i965/brw_blorp_clear.cpp
index d16da97c3c0d363b2e443816f00ddfb2a087f634..17d932517321231ef83d44121f913fcb240c7a6b 100644
(file)
--- a/
src/mesa/drivers/dri/i965/brw_blorp_clear.cpp
+++ b/
src/mesa/drivers/dri/i965/brw_blorp_clear.cpp
@@
-155,8
+155,6
@@
is_color_fast_clear_compatible(struct brw_context *brw,
for (int i = 0; i < 4; i++) {
if (color->f[i] != 0.0 && color->f[i] != 1.0 &&
_mesa_format_has_color_component(format, i)) {
for (int i = 0; i < 4; i++) {
if (color->f[i] != 0.0 && color->f[i] != 1.0 &&
_mesa_format_has_color_component(format, i)) {
- perf_debug("Clear color unsupported by fast color clear. "
- "Falling back to slow clear.\n");
return false;
}
}
return false;
}
}
@@
-225,7
+223,7
@@
brw_blorp_clear_params::brw_blorp_clear_params(struct brw_context *brw,
* accessing tiled memory. Using this Message Type to access linear
* (untiled) memory is UNDEFINED."
*/
* accessing tiled memory. Using this Message Type to access linear
* (untiled) memory is UNDEFINED."
*/
- if (irb->mt->
region->
tiling == I915_TILING_NONE)
+ if (irb->mt->tiling == I915_TILING_NONE)
wm_prog_key.use_simd16_replicated_data = false;
/* Constant color writes ignore everyting in blend and color calculator
wm_prog_key.use_simd16_replicated_data = false;
/* Constant color writes ignore everyting in blend and color calculator
@@
-342,6
+340,7
@@
brw_blorp_clear_params::brw_blorp_clear_params(struct brw_context *brw,
break;
default:
assert(!"Unexpected sample count for fast clear");
break;
default:
assert(!"Unexpected sample count for fast clear");
+ unreachable();
break;
}
y_scaledown = 2;
break;
}
y_scaledown = 2;
@@
-442,7
+441,7
@@
brw_blorp_const_color_program::compile(struct brw_context *brw,
alloc_regs();
alloc_regs();
- brw_set_compression_control(&func, BRW_COMPRESSION_NONE);
+ brw_set_
default_
compression_control(&func, BRW_COMPRESSION_NONE);
struct brw_reg mrf_rt_write =
retype(vec16(brw_message_reg(base_mrf)), BRW_REGISTER_TYPE_F);
struct brw_reg mrf_rt_write =
retype(vec16(brw_message_reg(base_mrf)), BRW_REGISTER_TYPE_F);
@@
-452,9
+451,9
@@
brw_blorp_const_color_program::compile(struct brw_context *brw,
/* The message payload is a single register with the low 4 floats/ints
* filled with the constant clear color.
*/
/* The message payload is a single register with the low 4 floats/ints
* filled with the constant clear color.
*/
- brw_set_mask_control(&func, BRW_MASK_DISABLE);
+ brw_set_
default_
mask_control(&func, BRW_MASK_DISABLE);
brw_MOV(&func, vec4(brw_message_reg(base_mrf)), clear_rgba);
brw_MOV(&func, vec4(brw_message_reg(base_mrf)), clear_rgba);
- brw_set_mask_control(&func, BRW_MASK_ENABLE);
+ brw_set_
default_
mask_control(&func, BRW_MASK_ENABLE);
msg_type = BRW_DATAPORT_RENDER_TARGET_WRITE_SIMD16_SINGLE_SOURCE_REPLICATED;
mlen = 1;
msg_type = BRW_DATAPORT_RENDER_TARGET_WRITE_SIMD16_SINGLE_SOURCE_REPLICATED;
mlen = 1;
@@
-463,11
+462,11
@@
brw_blorp_const_color_program::compile(struct brw_context *brw,
/* The message payload is pairs of registers for 16 pixels each of r,
* g, b, and a.
*/
/* The message payload is pairs of registers for 16 pixels each of r,
* g, b, and a.
*/
- brw_set_compression_control(&func, BRW_COMPRESSION_COMPRESSED);
+ brw_set_
default_
compression_control(&func, BRW_COMPRESSION_COMPRESSED);
brw_MOV(&func,
brw_message_reg(base_mrf + i * 2),
brw_vec1_grf(clear_rgba.nr, i));
brw_MOV(&func,
brw_message_reg(base_mrf + i * 2),
brw_vec1_grf(clear_rgba.nr, i));
- brw_set_compression_control(&func, BRW_COMPRESSION_NONE);
+ brw_set_
default_
compression_control(&func, BRW_COMPRESSION_NONE);
}
msg_type = BRW_DATAPORT_RENDER_TARGET_WRITE_SIMD16_SINGLE_SOURCE;
}
msg_type = BRW_DATAPORT_RENDER_TARGET_WRITE_SIMD16_SINGLE_SOURCE;
@@
-488,9
+487,11
@@
brw_blorp_const_color_program::compile(struct brw_context *brw,
if (unlikely(INTEL_DEBUG & DEBUG_BLORP)) {
fprintf(stderr, "Native code for BLORP clear:\n");
if (unlikely(INTEL_DEBUG & DEBUG_BLORP)) {
fprintf(stderr, "Native code for BLORP clear:\n");
- brw_d
ump_compile(&func, stderr, 0, func.next_insn_offset
);
+ brw_d
isassemble(brw, func.store, 0, func.next_insn_offset, stderr
);
fprintf(stderr, "\n");
}
fprintf(stderr, "\n");
}
+
+ brw_compact_instructions(&func, 0, 0, NULL);
return brw_get_program(&func, program_size);
}
return brw_get_program(&func, program_size);
}
@@
-569,12
+570,16
@@
do_single_blorp_clear(struct brw_context *brw, struct gl_framebuffer *fb,
extern "C" {
bool
brw_blorp_clear_color(struct brw_context *brw, struct gl_framebuffer *fb,
extern "C" {
bool
brw_blorp_clear_color(struct brw_context *brw, struct gl_framebuffer *fb,
- bool partial_clear)
+
GLbitfield mask,
bool partial_clear)
{
for (unsigned buf = 0; buf < fb->_NumColorDrawBuffers; buf++) {
struct gl_renderbuffer *rb = fb->_ColorDrawBuffers[buf];
struct intel_renderbuffer *irb = intel_renderbuffer(rb);
{
for (unsigned buf = 0; buf < fb->_NumColorDrawBuffers; buf++) {
struct gl_renderbuffer *rb = fb->_ColorDrawBuffers[buf];
struct intel_renderbuffer *irb = intel_renderbuffer(rb);
+ /* Only clear the buffers present in the provided mask */
+ if (((1 << fb->_ColorDrawBufferIndexes[buf]) & mask) == 0)
+ continue;
+
/* If this is an ES2 context or GL_ARB_ES2_compatibility is supported,
* the framebuffer can be complete with some attachments missing. In
* this case the _ColorDrawBuffers pointer will be NULL.
/* If this is an ES2 context or GL_ARB_ES2_compatibility is supported,
* the framebuffer can be complete with some attachments missing. In
* this case the _ColorDrawBuffers pointer will be NULL.
@@
-587,11
+592,10
@@
brw_blorp_clear_color(struct brw_context *brw, struct gl_framebuffer *fb,
(irb->mt->msaa_layout == INTEL_MSAA_LAYOUT_UMS ||
irb->mt->msaa_layout == INTEL_MSAA_LAYOUT_CMS) ?
irb->mt->num_samples : 1;
(irb->mt->msaa_layout == INTEL_MSAA_LAYOUT_UMS ||
irb->mt->msaa_layout == INTEL_MSAA_LAYOUT_CMS) ?
irb->mt->num_samples : 1;
- unsigned num_layers =
- irb->mt->level[irb->mt_level].depth / layer_multiplier;
+ unsigned num_layers = irb->layer_count;
for (unsigned layer = 0; layer < num_layers; layer++) {
if (!do_single_blorp_clear(brw, fb, rb, buf, partial_clear,
for (unsigned layer = 0; layer < num_layers; layer++) {
if (!do_single_blorp_clear(brw, fb, rb, buf, partial_clear,
- layer * layer_multiplier)) {
+
irb->mt_layer +
layer * layer_multiplier)) {
return false;
}
}
return false;
}
}