radeon/r200/r300: attempt to move lock to common code

1 files changed, 8 insertions, 3 deletions

diff --git a/src/mesa/drivers/dri/radeon/common_context.h b/src/mesa/drivers/dri/radeon/common_context.h
index 5778adf9fb..723f7d14fd 100644
--- a/src/mesa/drivers/dri/radeon/common_context.h
+++ b/src/mesa/drivers/dri/radeon/common_context.h
@@ -249,10 +249,11 @@ typedef void (*radeon_line_func) (radeonContextPtr,
 
 typedef void (*radeon_point_func) (radeonContextPtr, radeonVertex *);
 
-struct r300_radeon_state {
+struct radeon_state {
 	struct radeon_colorbuffer_state color;
+	struct radeon_depthbuffer_state depth;
 	struct radeon_scissor_state scissor;
-	struct radeon_renderbuffer *depth_buffer;
+	struct radeon_stencilbuffer_state stencil;
 };
 
 struct radeon_context {
@@ -301,12 +302,16 @@ struct radeon_context {
    GLuint swap_missed_count;
 
    /* Derived state - for r300 only */
-   struct r300_radeon_state state;
+   struct radeon_state state;
 
    /* Configuration cache
     */
    driOptionCache optionCache;
 
+   struct {
+      void (*get_lock)(radeonContextPtr radeon);
+      void (*update_viewport_offset)(GLcontext *ctx);
+   } vtbl;
 };
 
 #define RADEON_CONTEXT(glctx) ((radeonContextPtr)(ctx->DriverCtx))