Mesa (master): r300g: minor fixups

[Marek Olšák]

Module: Mesa
Branch: master
Commit: f9e8cdc145fc0ba1f6c47e20860add6528387c7c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f9e8cdc145fc0ba1f6c47e20860add6528387c7c

Author: Marek Olšák <maraeo at gmail.com>
Date:   Thu Jul  8 06:16:09 2010 +0200

r300g: minor fixups

---

 src/gallium/drivers/r300/r300_blit.c    |    3 ++-
 src/gallium/drivers/r300/r300_context.c |    2 +-
 src/gallium/drivers/r300/r300_context.h |    4 ++--
 src/gallium/drivers/r300/r300_hyperz.c  |    3 +--
 src/gallium/drivers/r300/r300_reg.h     |    2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/gallium/drivers/r300/r300_blit.c b/src/gallium/drivers/r300/r300_blit.c
index 97d53a1..2408a95 100644
--- a/src/gallium/drivers/r300/r300_blit.c
+++ b/src/gallium/drivers/r300/r300_blit.c
@@ -122,9 +122,10 @@ static void r300_clear(struct pipe_context* pipe,
      */
 
     struct r300_context* r300 = r300_context(pipe);
-    struct pipe_framebuffer_state* fb =
+    struct pipe_framebuffer_state *fb =
         (struct pipe_framebuffer_state*)r300->fb_state.state;
 
+    /* Clear. */
     r300_blitter_begin(r300, R300_CLEAR);
     util_blitter_clear(r300->blitter,
                        fb->width,
diff --git a/src/gallium/drivers/r300/r300_context.c b/src/gallium/drivers/r300/r300_context.c
index 2fe2e0a..3ca3436 100644
--- a/src/gallium/drivers/r300/r300_context.c
+++ b/src/gallium/drivers/r300/r300_context.c
@@ -327,7 +327,7 @@ static void r300_init_states(struct pipe_context *pipe)
 
     /* Initialize the hyperz state. */
     {
-        BEGIN_CB(&hyperz->cb_begin, 6);
+        BEGIN_CB(&hyperz->cb_begin, r300->hyperz_state.size);
         OUT_CB_REG(R300_ZB_BW_CNTL, 0);
         OUT_CB_REG(R300_ZB_DEPTHCLEARVALUE, 0);
         OUT_CB_REG(R300_SC_HYPERZ, 0x1C);
diff --git a/src/gallium/drivers/r300/r300_context.h b/src/gallium/drivers/r300/r300_context.h
index 5bc5d98..9a4df0a 100644
--- a/src/gallium/drivers/r300/r300_context.h
+++ b/src/gallium/drivers/r300/r300_context.h
@@ -308,9 +308,9 @@ struct r300_surface {
 
     enum r300_buffer_domain domain;
 
-    uint32_t offset;
+    uint32_t offset;    /* COLOROFFSET or DEPTHOFFSET. */
     uint32_t pitch;     /* COLORPITCH or DEPTHPITCH. */
-    uint32_t format;    /* US_OUT_FMT or R300_ZB_FORMAT. */
+    uint32_t format;    /* US_OUT_FMT or ZB_FORMAT. */
 };
 
 struct r300_texture {
diff --git a/src/gallium/drivers/r300/r300_hyperz.c b/src/gallium/drivers/r300/r300_hyperz.c
index e5c7658..2c4e6c7 100644
--- a/src/gallium/drivers/r300/r300_hyperz.c
+++ b/src/gallium/drivers/r300/r300_hyperz.c
@@ -21,9 +21,8 @@
  * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
  * USE OR OTHER DEALINGS IN THE SOFTWARE. */
 
-
-#include "r300_hyperz.h"
 #include "r300_context.h"
+#include "r300_hyperz.h"
 #include "r300_reg.h"
 #include "r300_fs.h"
 
diff --git a/src/gallium/drivers/r300/r300_reg.h b/src/gallium/drivers/r300/r300_reg.h
index f54a467..2acc1a9 100644
--- a/src/gallium/drivers/r300/r300_reg.h
+++ b/src/gallium/drivers/r300/r300_reg.h
@@ -2617,7 +2617,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #	define R300_WR_COMP_DISABLE                          (0 << 4)
 #	define R300_WR_COMP_ENABLE                           (1 << 4)
 #	define R300_ZB_CB_CLEAR_RMW                          (0 << 5)
-#	define R300_ZB_CB_CLEAR_CACHE_LINEAR                 (1 << 5)
+#	define R300_ZB_CB_CLEAR_CACHE_LINE_WRITE_ONLY        (1 << 5)
 #	define R300_FORCE_COMPRESSED_STENCIL_VALUE_DISABLE   (0 << 6)
 #	define R300_FORCE_COMPRESSED_STENCIL_VALUE_ENABLE    (1 << 6)