Attachment 8013 Details for Bug 9285 – Drop old (pre-AIGLX) GLcore interface.

[patch] Drop old (pre-AIGLX) GLcore interface.

0001-Drop-old-pre-AIGLX-GLcore-interface.txt (text/plain), 10.48 KB, created by George - on 2006-12-08 09:23:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: George -

Created: 2006-12-08 09:23:55 UTC

Size: 10.48 KB

patch

obsolete

>From 65cc73d2c80cd604b464f9efefe6549306aa2dda Mon Sep 17 00:00:00 2001
>From: George Sapountzis <gsap7@yahoo.gr>
>Date: Wed, 6 Dec 2006 06:43:23 +0200
>Subject: [PATCH] Drop old (pre-AIGLX) GLcore interface.
>
>The old GLcore interface was replaced in Xorg 7.1 with the addition of AIGLX,
>it is only used by DDX's which are known not to work with the new DIX glx code.
>---
> include/GL/internal/glcore.h |  257 ------------------------------------------
> src/mesa/main/context.c      |    7 -
> src/mesa/main/imports.c      |   13 --
> 3 files changed, 5 insertions(+), 272 deletions(-)
>
>diff --git a/include/GL/internal/glcore.h b/include/GL/internal/glcore.h
>index ca3cf5b..3cb792f 100644
>--- a/include/GL/internal/glcore.h
>+++ b/include/GL/internal/glcore.h
>@@ -190,259 +190,6 @@ #define GLX_TEXTURE_RECTANGLE_BIT_EXT   
> /************************************************************************/
> 
> /*
>-** Structure used for allocating and freeing drawable private memory.
>-** (like software buffers, for example).
>-**
>-** The memory allocation routines are provided by the surrounding
>-** "operating system" code, and they are to be used for allocating
>-** software buffers and things which are associated with the drawable,
>-** and used by any context which draws to that drawable.  There are
>-** separate memory allocation functions for drawables and contexts
>-** since drawables and contexts can be created and destroyed independently
>-** of one another, and the "operating system" may want to use separate
>-** allocation arenas for each.
>-**
>-** The freePrivate function is filled in by the core routines when they
>-** allocates software buffers, and stick them in "private".  The freePrivate
>-** function will destroy anything allocated to this drawable (to be called
>-** when the drawable is destroyed).
>-*/
>-typedef struct __GLdrawableRegionRec __GLdrawableRegion;
>-typedef struct __GLdrawableBufferRec __GLdrawableBuffer;
>-typedef struct __GLdrawablePrivateRec __GLdrawablePrivate;
>-
>-typedef struct __GLregionRectRec {
>-    /* lower left (inside the rectangle) */
>-    GLint x0, y0;
>-    /* upper right (outside the rectangle) */
>-    GLint x1, y1;
>-} __GLregionRect;
>-
>-struct __GLdrawableRegionRec {
>-    GLint numRects;
>-    __GLregionRect *rects;
>-    __GLregionRect boundingRect;
>-};
>-
>-/************************************************************************/
>-
>-/* masks for the buffers */
>-#define __GL_FRONT_BUFFER_MASK		0x00000001
>-#define	__GL_FRONT_LEFT_BUFFER_MASK	0x00000001
>-#define	__GL_FRONT_RIGHT_BUFFER_MASK	0x00000002
>-#define	__GL_BACK_BUFFER_MASK		0x00000004
>-#define __GL_BACK_LEFT_BUFFER_MASK	0x00000004
>-#define __GL_BACK_RIGHT_BUFFER_MASK	0x00000008
>-#define	__GL_ACCUM_BUFFER_MASK		0x00000010
>-#define	__GL_DEPTH_BUFFER_MASK		0x00000020
>-#define	__GL_STENCIL_BUFFER_MASK	0x00000040
>-#define	__GL_AUX_BUFFER_MASK(i)		(0x0000080 << (i))
>-
>-#define __GL_ALL_BUFFER_MASK		0xffffffff
>-
>-/* what Resize routines return if resize resorted to fallback case */
>-#define __GL_BUFFER_FALLBACK	0x10
>-
>-typedef void (*__GLbufFallbackInitFn)(__GLdrawableBuffer *buf, 
>-				      __GLdrawablePrivate *glPriv, GLint bits);
>-typedef void (*__GLbufMainInitFn)(__GLdrawableBuffer *buf, 
>-				  __GLdrawablePrivate *glPriv, GLint bits,
>-				  __GLbufFallbackInitFn back);
>-
>-/*
>-** A drawable buffer
>-**
>-** This data structure describes the context side of a drawable.  
>-**
>-** According to the spec there could be multiple contexts bound to the same
>-** drawable at the same time (from different threads).  In order to avoid
>-** multiple-access conflicts, locks are used to serialize access.  When a
>-** thread needs to access (read or write) a member of the drawable, it takes
>-** a lock first.  Some of the entries in the drawable are treated "mostly
>-** constant", so we take the freedom of allowing access to them without
>-** taking a lock (for optimization reasons).
>-**
>-** For more details regarding locking, see buffers.h in the GL core
>-*/
>-struct __GLdrawableBufferRec {
>-    /*
>-    ** Buffer dimensions
>-    */
>-    GLint width, height, depth;
>-
>-    /*
>-    ** Framebuffer base address
>-    */
>-    void *base;
>-
>-    /*
>-    ** Framebuffer size (in bytes)
>-    */
>-    GLuint size;
>-
>-    /*
>-    ** Size (in bytes) of each element in the framebuffer
>-    */
>-    GLuint elementSize;
>-    GLuint elementSizeLog2;
>-
>-    /*
>-    ** Element skip from one scanline to the next.
>-    ** If the buffer is part of another buffer (for example, fullscreen
>-    ** front buffer), outerWidth is the width of that buffer.
>-    */
>-    GLint outerWidth;
>-
>-    /*
>-    ** outerWidth * elementSize
>-    */
>-    GLint byteWidth;
>-
>-    /*
>-    ** Allocation/deallocation is done based on this handle.  A handle
>-    ** is conceptually different from the framebuffer 'base'.
>-    */
>-    void *handle;
>-
>-    /* imported */
>-    GLboolean (*resize)(__GLdrawableBuffer *buf,
>-			GLint x, GLint y, GLuint width, GLuint height, 
>-			__GLdrawablePrivate *glPriv, GLuint bufferMask);
>-    void (*lock)(__GLdrawableBuffer *buf, __GLdrawablePrivate *glPriv);
>-    void (*unlock)(__GLdrawableBuffer *buf, __GLdrawablePrivate *glPriv);
>-    void (*fill)(__GLdrawableBuffer *buf, __GLdrawablePrivate *glPriv,
>-    		GLuint val, GLint x, GLint y, GLint w, GLint h);
>-    void (*free)(__GLdrawableBuffer *buf, __GLdrawablePrivate *glPriv);
>-
>-    /* exported */
>-    void (*freePrivate)(__GLdrawableBuffer *buf, __GLdrawablePrivate *glPriv);
>-#ifdef __cplusplus
>-    void *privatePtr;
>-#else
>-    void *private;
>-#endif
>-
>-    /* private */
>-    void *other;	/* implementation private data */
>-    __GLbufMainInitFn mainInit;
>-    __GLbufFallbackInitFn fallbackInit;
>-};
>-
>-/*
>-** The context side of the drawable private
>-*/
>-struct __GLdrawablePrivateRec {
>-    /*
>-    ** Drawable Modes
>-    */
>-    __GLcontextModes *modes;
>-
>-    /*
>-    ** Drawable size
>-    */
>-    GLuint width, height;
>-
>-    /*
>-    ** Origin in screen coordinates of the drawable
>-    */
>-    GLint xOrigin, yOrigin;
>-#ifdef __GL_ALIGNED_BUFFERS
>-    /*
>-    ** Drawable offset from screen origin
>-    */
>-    GLint xOffset, yOffset;
>-
>-    /*
>-    ** Alignment restriction
>-    */
>-    GLint xAlignment, yAlignment;
>-#endif
>-    /*
>-    ** Should we invert the y axis?
>-    */
>-    GLint yInverted;
>-
>-    /*
>-    ** Mask specifying which buffers are renderable by the hw
>-    */
>-    GLuint accelBufferMask;
>-
>-    /*
>-    ** the buffers themselves
>-    */
>-    __GLdrawableBuffer frontBuffer;
>-    __GLdrawableBuffer backBuffer;
>-    __GLdrawableBuffer accumBuffer;
>-    __GLdrawableBuffer depthBuffer;
>-    __GLdrawableBuffer stencilBuffer;
>-#if defined(__GL_NUMBER_OF_AUX_BUFFERS) && (__GL_NUMBER_OF_AUX_BUFFERS > 0)
>-    __GLdrawableBuffer *auxBuffer;
>-#endif
>-
>-    __GLdrawableRegion ownershipRegion;
>-
>-    /*
>-    ** Lock for the drawable private structure
>-    */
>-    void *lock;
>-#ifdef DEBUG
>-    /* lock debugging info */
>-    int lockRefCount;
>-    int lockLine[10];
>-    char *lockFile[10];
>-#endif
>-
>-    /* imported */
>-    void *(*malloc)(size_t size);
>-    void *(*calloc)(size_t numElem, size_t elemSize);
>-    void *(*realloc)(void *oldAddr, size_t newSize);
>-    void (*free)(void *addr);
>-
>-    GLboolean (*addSwapRect)(__GLdrawablePrivate *glPriv, 
>-			     GLint x, GLint y, GLsizei width, GLsizei height);
>-    void (*setClipRect)(__GLdrawablePrivate *glPriv, 
>-			GLint x, GLint y, GLsizei width, GLsizei height);
>-    void (*updateClipRegion)(__GLdrawablePrivate *glPriv);
>-    GLboolean (*resize)(__GLdrawablePrivate *glPriv);
>-    void (*getDrawableSize)(__GLdrawablePrivate *glPriv, 
>-			    GLint *x, GLint *y, GLuint *width, GLuint *height);
>-
>-    void (*lockDP)(__GLdrawablePrivate *glPriv, __GLcontext *gc);
>-    void (*unlockDP)(__GLdrawablePrivate *glPriv);
>-
>-    /* exported */
>-#ifdef __cplusplus
>-    void *privatePtr;
>-#else
>-    void *private;
>-#endif
>-    void (*freePrivate)(__GLdrawablePrivate *);
>-
>-    /* client data */
>-    void *other;
>-};
>-
>-/*
>-** Macros to lock/unlock the drawable private
>-*/
>-#if defined(DEBUG)
>-#define __GL_LOCK_DP(glPriv,gc) \
>-    (*(glPriv)->lockDP)(glPriv,gc); \
>-    (glPriv)->lockLine[(glPriv)->lockRefCount] = __LINE__; \
>-    (glPriv)->lockFile[(glPriv)->lockRefCount] = __FILE__; \
>-    (glPriv)->lockRefCount++
>-#define __GL_UNLOCK_DP(glPriv) \
>-    (glPriv)->lockRefCount--; \
>-    (glPriv)->lockLine[(glPriv)->lockRefCount] = 0; \
>-    (glPriv)->lockFile[(glPriv)->lockRefCount] = NULL; \
>-    (*(glPriv)->unlockDP)(glPriv)
>-#else /* DEBUG */
>-#define __GL_LOCK_DP(glPriv,gc)		(*(glPriv)->lockDP)(glPriv,gc)
>-#define	__GL_UNLOCK_DP(glPriv)		(*(glPriv)->unlockDP)(glPriv)
>-#endif /* DEBUG */
>-
>-
>-/*
> ** Procedures which are imported by the GL from the surrounding
> ** "operating system".  Math functions are not considered part of the
> ** "operating system".
>@@ -467,8 +214,8 @@ typedef struct __GLimportsRec {
>     int (CAPI *fprintf)(__GLcontext *gc, void *stream, const char *fmt, ...);
> 
>     /* Drawing surface management */
>-    __GLdrawablePrivate *(*getDrawablePrivate)(__GLcontext *gc);
>-    __GLdrawablePrivate *(*getReadablePrivate)(__GLcontext *gc);
>+    void *(*getDrawablePrivate)(__GLcontext *gc);
>+    void *(*getReadablePrivate)(__GLcontext *gc);
> 
>     /* Operating system dependent data goes here */
>     void *other;
>diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
>index 7ff45cf..b2bd1d8 100644
>--- a/src/mesa/main/context.c
>+++ b/src/mesa/main/context.c
>@@ -292,13 +292,8 @@ _mesa_forceCurrent(__GLcontext *gc)
> GLboolean
> _mesa_notifyResize(__GLcontext *gc)
> {
>-   GLint x, y;
>-   GLuint width, height;
>-   __GLdrawablePrivate *d = gc->imports.getDrawablePrivate(gc);
>-   if (!d || !d->getDrawableSize)
>-      return GL_FALSE;
>-   d->getDrawableSize( d, &x, &y, &width, &height );
>    /* update viewport, resize software buffers, etc. */
>+   (void) gc;
>    return GL_TRUE;
> }
> 
>diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c
>index ed809ac..996839a 100644
>--- a/src/mesa/main/imports.c
>+++ b/src/mesa/main/imports.c
>@@ -1176,16 +1176,6 @@ default_fprintf(__GLcontext *gc, void *s
>    return r;
> }
> 
>-/**
>- * \todo this really is driver-specific and can't be here 
>- */
>-static __GLdrawablePrivate *
>-default_GetDrawablePrivate(__GLcontext *gc)
>-{
>-   (void) gc;
>-   return NULL;
>-}
>-
> /*@}*/
> 
> 
>@@ -1222,6 +1212,7 @@ _mesa_init_default_imports(__GLimports *
>    imports->fopen = default_fopen;
>    imports->fclose = default_fclose;
>    imports->fprintf = default_fprintf;
>-   imports->getDrawablePrivate = default_GetDrawablePrivate;
>+   imports->getDrawablePrivate = NULL; /* driver-specific */
>+   imports->getReadablePrivate = NULL; /* driver-specific */
>    imports->other = driverCtx;
> }
>-- 
>1.4.0-dirty
>

Actions: View | Splinter Review

Attachments on bug 9285: 8013 | 8014 | 8015 | 8506 | 9377

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.