summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2010-02-11 11:26:04 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2010-02-18 15:39:28 +0100
commitd982ce371649354299a38eb3449899ffb4c373a7 (patch)
tree3968ef9726b9416ad6f31255e13d9a85993842ce
parentfe7bf228fbb80bd0df0634f702b228a6be6a05ee (diff)
glamo: remove Private postfix from __DRI* wrt http://cgit.freedesktop.org/mesa/mesa/commit/?id=d61f07318c8678901b948fdaa8ccdf37aa3203e9
-rw-r--r--src/mesa/drivers/dri/glamo/glamo_context.c2
-rw-r--r--src/mesa/drivers/dri/glamo/glamo_context.h6
-rw-r--r--src/mesa/drivers/dri/glamo/glamo_fbo.c2
-rw-r--r--src/mesa/drivers/dri/glamo/glamo_fbo.h4
-rw-r--r--src/mesa/drivers/dri/glamo/glamo_screen.c10
-rw-r--r--src/mesa/drivers/dri/glamo/glamo_screen.h2
6 files changed, 13 insertions, 13 deletions
diff --git a/src/mesa/drivers/dri/glamo/glamo_context.c b/src/mesa/drivers/dri/glamo/glamo_context.c
index 47241ae9b8..527654fd0a 100644
--- a/src/mesa/drivers/dri/glamo/glamo_context.c
+++ b/src/mesa/drivers/dri/glamo/glamo_context.c
@@ -100,7 +100,7 @@ GLboolean glamoCreateContext(const __GLcontextModes *glVisual,
void *sharedContextPrivate)
{
GLcontext *ctx, *shareCtx;
- __DRIscreenPrivate *sPriv = driContextPriv->driScreenPriv;
+ __DRIscreen *sPriv = driContextPriv->driScreenPriv;
glamoContextPtr context;
glamoScreenPtr glamoScreen;
struct dd_function_table functions;
diff --git a/src/mesa/drivers/dri/glamo/glamo_context.h b/src/mesa/drivers/dri/glamo/glamo_context.h
index 3372708ec2..ccce29cfef 100644
--- a/src/mesa/drivers/dri/glamo/glamo_context.h
+++ b/src/mesa/drivers/dri/glamo/glamo_context.h
@@ -42,9 +42,9 @@ struct glamo_context {
int drm_fd; /* DRM fd */
- __DRIcontextPrivate *driContext; /* DRI context */
- __DRIscreenPrivate *driScreen; /* DRI screen */
- __DRIdrawablePrivate *driDrawable; /* DRI drawable bound to this ctx */
+ __DRIcontext *driContext; /* DRI context */
+ __DRIscreen *driScreen; /* DRI screen */
+ __DRIdrawable *driDrawable; /* DRI drawable bound to this ctx */
glamoScreenPtr glamoScreen; /* Screen private DRI data */
diff --git a/src/mesa/drivers/dri/glamo/glamo_fbo.c b/src/mesa/drivers/dri/glamo/glamo_fbo.c
index a686f30321..1a41db79b5 100644
--- a/src/mesa/drivers/dri/glamo/glamo_fbo.c
+++ b/src/mesa/drivers/dri/glamo/glamo_fbo.c
@@ -77,7 +77,7 @@ static GLboolean glamo_alloc_window_storage(GLcontext *ctx,
/* Create a buffer, such as a colour or depth buffer */
struct glamo_renderbuffer *glamo_create_renderbuffer(GLenum format,
- __DRIdrawablePrivate *driDrawPriv)
+ __DRIdrawable *driDrawPriv)
{
struct glamo_renderbuffer *grb;
diff --git a/src/mesa/drivers/dri/glamo/glamo_fbo.h b/src/mesa/drivers/dri/glamo/glamo_fbo.h
index 52e1ceab42..48210dd309 100644
--- a/src/mesa/drivers/dri/glamo/glamo_fbo.h
+++ b/src/mesa/drivers/dri/glamo/glamo_fbo.h
@@ -42,7 +42,7 @@ struct glamo_renderbuffer
unsigned int width;
unsigned int height;
- __DRIdrawablePrivate *dPriv;
+ __DRIdrawable *dPriv;
};
@@ -67,7 +67,7 @@ static inline struct glamo_renderbuffer
extern struct glamo_renderbuffer *glamo_create_renderbuffer(GLenum format,
- __DRIdrawablePrivate *driDrawPriv);
+ __DRIdrawable *driDrawPriv);
extern void glamo_renderbuffer_set_bo(struct glamo_renderbuffer *grb,
struct glamo_bo *bo);
diff --git a/src/mesa/drivers/dri/glamo/glamo_screen.c b/src/mesa/drivers/dri/glamo/glamo_screen.c
index 2457c0b80e..abfb8f4d17 100644
--- a/src/mesa/drivers/dri/glamo/glamo_screen.c
+++ b/src/mesa/drivers/dri/glamo/glamo_screen.c
@@ -38,13 +38,13 @@
#include <glamo_bo_gem.h>
-static int glamoInitDriver(__DRIscreenPrivate *psp)
+static int glamoInitDriver(__DRIscreen *psp)
{
return 0;
}
-static glamoScreenPtr glamoCreateScreen(__DRIscreenPrivate *sPriv)
+static glamoScreenPtr glamoCreateScreen(__DRIscreen *sPriv)
{
glamoScreenPtr glamoScreen;
@@ -62,7 +62,7 @@ static glamoScreenPtr glamoCreateScreen(__DRIscreenPrivate *sPriv)
}
-static void glamoDestroyScreen(__DRIscreenPrivate *sPriv)
+static void glamoDestroyScreen(__DRIscreen *sPriv)
{
glamoScreenPtr glamoScreen = (glamoScreenPtr)sPriv->private;
@@ -74,7 +74,7 @@ static void glamoDestroyScreen(__DRIscreenPrivate *sPriv)
}
-static const __DRIconfig **glamoInitScreen(__DRIscreenPrivate *sPriv)
+static const __DRIconfig **glamoInitScreen(__DRIscreen *sPriv)
{
__DRIconfig **configs;
uint8_t depth_bits_array[2];
@@ -113,7 +113,7 @@ static const __DRIconfig **glamoInitScreen(__DRIscreenPrivate *sPriv)
}
-static const __DRIconfig **glamoInitScreen2(__DRIscreenPrivate *sPriv)
+static const __DRIconfig **glamoInitScreen2(__DRIscreen *sPriv)
{
__DRIconfig **configs;
uint8_t depth_bits_array[2];
diff --git a/src/mesa/drivers/dri/glamo/glamo_screen.h b/src/mesa/drivers/dri/glamo/glamo_screen.h
index 8cd98c9056..3f2eb5f00a 100644
--- a/src/mesa/drivers/dri/glamo/glamo_screen.h
+++ b/src/mesa/drivers/dri/glamo/glamo_screen.h
@@ -32,7 +32,7 @@
typedef struct {
- __DRIscreenPrivate *driScreen;
+ __DRIscreen *driScreen;
driOptionCache optionCache;
struct glamo_bo_manager *bom;