i965/miptree: Replace is_lossless_compressed with mt->aux_usage checks

[mesa.git] / src / mesa / drivers / dri / radeon / radeon_common.h

diff --git a/src/mesa/drivers/dri/radeon/radeon_common.h b/src/mesa/drivers/dri/radeon/radeon_common.h
index 344250efcef3ae91829444ff3252a0094df9e5c7..fedaf5063a762e6a260643cbfdb71a285edb7141 100644 (file)
--- a/src/mesa/drivers/dri/radeon/radeon_common.h
+++ b/src/mesa/drivers/dri/radeon/radeon_common.h
@@ -6,10 +6,9 @@
 #include "radeon_texture.h"
 
 void radeonUserClear(struct gl_context *ctx, GLuint mask);
-void radeonRecalcScissorRects(radeonContextPtr radeon);
 void radeonSetCliprects(radeonContextPtr radeon);
 void radeonUpdateScissor( struct gl_context *ctx );
-void radeonScissor(struct gl_context* ctx, GLint x, GLint y, GLsizei w, GLsizei h);
+void radeonScissor(struct gl_context *ctx);
 
 extern uint32_t radeonGetAge(radeonContextPtr radeon);
 
@@ -24,17 +23,13 @@ void radeon_window_moved(radeonContextPtr radeon);
 void radeon_draw_buffer(struct gl_context *ctx, struct gl_framebuffer *fb);
 void radeonDrawBuffer( struct gl_context *ctx, GLenum mode );
 void radeonReadBuffer( struct gl_context *ctx, GLenum mode );
-void radeon_viewport(struct gl_context *ctx, GLint x, GLint y, GLsizei width, GLsizei height);
-void radeon_get_cliprects(radeonContextPtr radeon,
-                         struct drm_clip_rect **cliprects,
-                         unsigned int *num_cliprects,
-                         int *x_off, int *y_off);
+void radeon_viewport(struct gl_context *ctx);
 void radeon_fbo_init(struct radeon_context *radeon);
 void
 radeon_renderbuffer_set_bo(struct radeon_renderbuffer *rb,
                           struct radeon_bo *bo);
 struct radeon_renderbuffer *
-radeon_create_renderbuffer(gl_format format, __DRIdrawable *driDrawPriv);
+radeon_create_renderbuffer(mesa_format format, __DRIdrawable *driDrawPriv);
 
 void
 radeonReadPixels(struct gl_context * ctx,
@@ -48,8 +43,8 @@ static inline struct radeon_renderbuffer *radeon_renderbuffer(struct gl_renderbu
        struct radeon_renderbuffer *rrb = (struct radeon_renderbuffer *)rb;
        radeon_print(RADEON_MEMORY, RADEON_TRACE,
                "%s(rb %p)\n",
-               __func__, rb);
-       if (rrb && rrb->base.ClassID == RADEON_RB_CLASS)
+               __func__, (void *) rb);
+       if (rrb && rrb->base.Base.ClassID == RADEON_RB_CLASS)
                return rrb;
        else
                return NULL;
@@ -59,7 +54,7 @@ static inline struct radeon_renderbuffer *radeon_get_renderbuffer(struct gl_fram
 {
        radeon_print(RADEON_MEMORY, RADEON_TRACE,
                "%s(fb %p, index %d)\n",
-               __func__, fb, att_index);
+               __func__, (void *) fb, att_index);
 
        if (att_index >= 0)
                return radeon_renderbuffer(fb->Attachment[att_index].Renderbuffer);