projects
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
5161521
)
r300g: rename dirty_zmask -> zmask_in_use
author
Marek Olšák
<maraeo@gmail.com>
Sun, 15 Aug 2010 00:18:15 +0000
(
02:18
+0200)
committer
Marek Olšák
<maraeo@gmail.com>
Sun, 15 Aug 2010 06:07:11 +0000
(08:07 +0200)
src/gallium/drivers/r300/r300_blit.c
patch
|
blob
|
history
src/gallium/drivers/r300/r300_context.h
patch
|
blob
|
history
src/gallium/drivers/r300/r300_emit.c
patch
|
blob
|
history
src/gallium/drivers/r300/r300_hyperz.c
patch
|
blob
|
history
src/gallium/drivers/r300/r300_state_derived.c
patch
|
blob
|
history
diff --git
a/src/gallium/drivers/r300/r300_blit.c
b/src/gallium/drivers/r300/r300_blit.c
index 00756c771c9873beb09989a3d862d826a1f1351a..29393109fac175a6c6660a10b5cb59bf600a9b0f 100644
(file)
--- a/
src/gallium/drivers/r300/r300_blit.c
+++ b/
src/gallium/drivers/r300/r300_blit.c
@@
-251,10
+251,10
@@
static void r300_clear(struct pipe_context* pipe,
/* Enable fastfill.
*
/* Enable fastfill.
*
- * If we cleared the zmask, it's
dirty
now. The Hyper-Z state update
- * looks
for a dirty zmask
and enables fastfill accordingly. */
+ * If we cleared the zmask, it's
in use
now. The Hyper-Z state update
+ * looks
if zmask is in use
and enables fastfill accordingly. */
if (fb->zsbuf &&
if (fb->zsbuf &&
- r300_texture(fb->zsbuf->texture)->
dirty_zmask
[fb->zsbuf->level]) {
+ r300_texture(fb->zsbuf->texture)->
zmask_in_use
[fb->zsbuf->level]) {
r300->hyperz_state.dirty = TRUE;
}
r300->hyperz_state.dirty = TRUE;
}
@@
-307,7
+307,7
@@
void r300_flush_depth_stencil(struct pipe_context *pipe,
if (!tex->zmask_mem[subdst.level])
return;
if (!tex->zmask_mem[subdst.level])
return;
- if (!tex->
dirty_zmask
[subdst.level])
+ if (!tex->
zmask_in_use
[subdst.level])
return;
dstsurf = pipe->screen->get_tex_surface(pipe->screen, dst,
return;
dstsurf = pipe->screen->get_tex_surface(pipe->screen, dst,
@@
-319,7
+319,7
@@
void r300_flush_depth_stencil(struct pipe_context *pipe,
r300_blitter_end(r300);
r300->z_decomp_rd = FALSE;
r300_blitter_end(r300);
r300->z_decomp_rd = FALSE;
- tex->
dirty_zmask
[subdst.level] = FALSE;
+ tex->
zmask_in_use
[subdst.level] = FALSE;
}
/* Copy a block of pixels from one surface to another using HW. */
}
/* Copy a block of pixels from one surface to another using HW. */
diff --git
a/src/gallium/drivers/r300/r300_context.h
b/src/gallium/drivers/r300/r300_context.h
index 98e6d358e91c0399dbb2bcf2eecf323b8fea8bb1..6c4c396982fdce50e81598e6a1cc87ca15afe9f4 100644
(file)
--- a/
src/gallium/drivers/r300/r300_context.h
+++ b/
src/gallium/drivers/r300/r300_context.h
@@
-397,7
+397,7
@@
struct r300_texture {
/* hyper-z memory allocs */
struct mem_block *hiz_mem[R300_MAX_TEXTURE_LEVELS];
struct mem_block *zmask_mem[R300_MAX_TEXTURE_LEVELS];
/* hyper-z memory allocs */
struct mem_block *hiz_mem[R300_MAX_TEXTURE_LEVELS];
struct mem_block *zmask_mem[R300_MAX_TEXTURE_LEVELS];
- boolean
dirty_zmask
[R300_MAX_TEXTURE_LEVELS];
+ boolean
zmask_in_use
[R300_MAX_TEXTURE_LEVELS];
/* This is the level tiling flags were last time set for.
* It's used to prevent redundant tiling-flags changes from happening.*/
/* This is the level tiling flags were last time set for.
* It's used to prevent redundant tiling-flags changes from happening.*/
diff --git
a/src/gallium/drivers/r300/r300_emit.c
b/src/gallium/drivers/r300/r300_emit.c
index ccf360b6ea2a4b4f817ec932c8a9b230a823d7ea..fe334c924e4e9b4694f9154673695ea185d72975 100644
(file)
--- a/
src/gallium/drivers/r300/r300_emit.c
+++ b/
src/gallium/drivers/r300/r300_emit.c
@@
-1086,8
+1086,8
@@
void r300_emit_zmask_clear(struct r300_context *r300, unsigned size, void *state
r300_emit_zmask_line_clear(r300, offset, stride, 0x0);//0xffffffff);
}
r300_emit_zmask_line_clear(r300, offset, stride, 0x0);//0xffffffff);
}
- /* Mark the current zbuffer's zmask as
dirty
. */
- tex->
dirty_zmask
[fb->zsbuf->level] = TRUE;
+ /* Mark the current zbuffer's zmask as
in use
. */
+ tex->
zmask_in_use
[fb->zsbuf->level] = TRUE;
}
void r300_emit_ztop_state(struct r300_context* r300,
}
void r300_emit_ztop_state(struct r300_context* r300,
diff --git
a/src/gallium/drivers/r300/r300_hyperz.c
b/src/gallium/drivers/r300/r300_hyperz.c
index 1f6244c49e6681e3ece83b60a50f14cd3284d68a..9cce195eb46ac495b638e9ec94e36a3c6c9cda85 100644
(file)
--- a/
src/gallium/drivers/r300/r300_hyperz.c
+++ b/
src/gallium/drivers/r300/r300_hyperz.c
@@
-131,7
+131,7
@@
static void r300_update_hyperz(struct r300_context* r300)
(struct r300_hyperz_state*)r300->hyperz_state.state;
struct pipe_framebuffer_state *fb =
(struct pipe_framebuffer_state*)r300->fb_state.state;
(struct r300_hyperz_state*)r300->hyperz_state.state;
struct pipe_framebuffer_state *fb =
(struct pipe_framebuffer_state*)r300->fb_state.state;
- boolean
dirty_zmask
= FALSE;
+ boolean
zmask_in_use
= FALSE;
z->gb_z_peq_config = 0;
z->zb_bw_cntl = 0;
z->gb_z_peq_config = 0;
z->zb_bw_cntl = 0;
@@
-149,15
+149,15
@@
static void r300_update_hyperz(struct r300_context* r300)
if (!r300->rws->get_value(r300->rws, R300_CAN_HYPERZ))
return;
if (!r300->rws->get_value(r300->rws, R300_CAN_HYPERZ))
return;
-
dirty_zmask = r300_texture(fb->zsbuf->texture)->dirty_zmask
[fb->zsbuf->level];
+
zmask_in_use = r300_texture(fb->zsbuf->texture)->zmask_in_use
[fb->zsbuf->level];
/* Z fastfill. */
/* Z fastfill. */
- if (
dirty_zmask
) {
+ if (
zmask_in_use
) {
z->zb_bw_cntl |= R300_FAST_FILL_ENABLE; /* | R300_FORCE_COMPRESSED_STENCIL_VALUE_ENABLE;*/
}
/* Zbuffer compression. */
z->zb_bw_cntl |= R300_FAST_FILL_ENABLE; /* | R300_FORCE_COMPRESSED_STENCIL_VALUE_ENABLE;*/
}
/* Zbuffer compression. */
- if (
dirty_zmask
&& r300->z_compression) {
+ if (
zmask_in_use
&& r300->z_compression) {
z->zb_bw_cntl |= R300_RD_COMP_ENABLE;
if (r300->z_decomp_rd == false)
z->zb_bw_cntl |= R300_WR_COMP_ENABLE;
z->zb_bw_cntl |= R300_RD_COMP_ENABLE;
if (r300->z_decomp_rd == false)
z->zb_bw_cntl |= R300_WR_COMP_ENABLE;
diff --git
a/src/gallium/drivers/r300/r300_state_derived.c
b/src/gallium/drivers/r300/r300_state_derived.c
index c047a127ba70abc1b753d372e50e3e4c29de14f7..4a63ed7fc13fdd85f581a74f719f835e93ba86b8 100644
(file)
--- a/
src/gallium/drivers/r300/r300_state_derived.c
+++ b/
src/gallium/drivers/r300/r300_state_derived.c
@@
-738,7
+738,7
@@
static void r300_flush_depth_textures(struct r300_context *r300)
continue;
for (level = 0; level <= tex->last_level; level++)
continue;
for (level = 0; level <= tex->last_level; level++)
- if (r300_texture(tex)->
dirty_zmask
[level]) {
+ if (r300_texture(tex)->
zmask_in_use
[level]) {
/* We don't handle 3D textures and cubemaps yet. */
r300_flush_depth_stencil(&r300->context, tex,
u_subresource(0, level), 0);
/* We don't handle 3D textures and cubemaps yet. */
r300_flush_depth_stencil(&r300->context, tex,
u_subresource(0, level), 0);