OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix up build for solo/dri

Browse Source
This commit is contained in:
Dave Airlie
2004-05-03 06:49:40 +00:00
parent 79518b6f37
commit f7423f4628
5 changed files with 11 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/mesa/drivers/dri/dri_client/Makefile
View File

@@ -21,6 +21,7 @@ OBJECTS = $(C_SOURCES:.c=.o)
INCLUDES = \ INCLUDES = \
-I$(TOP)/include \ -I$(TOP)/include \
-I$(DRM_SOURCE_PATH)/shared \
-I$(TOP)/include/GL/internal \ -I$(TOP)/include/GL/internal \
-I$(TOP)/src/mesa \ -I$(TOP)/src/mesa \
-I$(TOP)/src/mesa/main \ -I$(TOP)/src/mesa/main \

2
src/mesa/drivers/dri/dri_client/dri_util.c
View File

@@ -36,9 +36,9 @@
#include <Xext.h> #include <Xext.h>
#include <extutil.h> #include <extutil.h>
#include <stdio.h> #include <stdio.h>
#include "dri_util.h"
#include "xf86dri.h" #include "xf86dri.h"
#include "sarea.h" #include "sarea.h"
#include "dri_util.h"
#include "glcontextmodes.h" #include "glcontextmodes.h"
/*#define DRI_NEW_INTERFACE_ONLY*/ /*#define DRI_NEW_INTERFACE_ONLY*/

10
src/mesa/drivers/dri/dri_client/dri_util.h
View File

@@ -57,7 +57,7 @@
#include "glxclient.h" /* for GLXDrawable */ #include "glxclient.h" /* for GLXDrawable */
/* temporary */ /* temporary */
/* typedef Bool ( * PFNGLXGETMSCRATEOMLPROC) (Display *dpy, GLXDrawable drawable, int32_t *numerator, int32_t *denominator); */ /* typedef Bool ( * PFNGLXGETMSCRATEOMLPROC) (Display *dpy, GLXDrawable drawable, int32_t *numerator, int32_t *denominator); */
#include "xf86dri.h" /* for XF86DRIClipRectPtr */ #include "drm.h" /* for drm_clip_rect_t */
#include "sarea.h" /* for XF86DRISAREAPtr */ #include "sarea.h" /* for XF86DRISAREAPtr */
#include "GL/internal/glcore.h" /* for __GLcontextModes */ #include "GL/internal/glcore.h" /* for __GLcontextModes */
@@ -257,9 +257,9 @@ struct __DRIswapInfoRec {
typedef Bool (GetDrawableInfo)( Display *dpy, int scrn, Drawable draw, typedef Bool (GetDrawableInfo)( Display *dpy, int scrn, Drawable draw,
unsigned int * index, unsigned int * stamp, unsigned int * index, unsigned int * stamp,
int * x, int * y, int * width, int * height, int * x, int * y, int * width, int * height,
int * numClipRects, XF86DRIClipRectPtr * pClipRects, int * numClipRects, drm_clip_rect_t * pClipRects,
int * backX, int * backY, int * backX, int * backY,
int * numBackClipRects, XF86DRIClipRectPtr * pBackClipRects ); int * numBackClipRects, drm_clip_rect_t * pBackClipRects );
/** /**
@@ -324,7 +324,7 @@ struct __DRIdrawablePrivateRec {
int w; int w;
int h; int h;
int numClipRects; int numClipRects;
XF86DRIClipRectPtr pClipRects; drm_clip_rect_t *pClipRects;
/*@}*/ /*@}*/
/** /**
@@ -337,7 +337,7 @@ struct __DRIdrawablePrivateRec {
int backY; int backY;
int backClipRectType; int backClipRectType;
int numBackClipRects; int numBackClipRects;
XF86DRIClipRectPtr pBackClipRects; drm_clip_rect_t *pBackClipRects;
/*@}*/ /*@}*/
/** /**

14
src/mesa/drivers/dri/dri_client/xf86dri.h
View File

@@ -39,6 +39,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define _XF86DRI_H_ #define _XF86DRI_H_
#include <X11/Xfuncproto.h> #include <X11/Xfuncproto.h>
#include "drm.h"
#include <xf86drm.h> #include <xf86drm.h>
#define X_XF86DRIQueryVersion 0 #define X_XF86DRIQueryVersion 0
@@ -62,15 +63,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define XF86DRIOperationNotSupported 1 #define XF86DRIOperationNotSupported 1
#define XF86DRINumberErrors (XF86DRIOperationNotSupported + 1) #define XF86DRINumberErrors (XF86DRIOperationNotSupported + 1)
/* Warning : Do not change XF86DRIClipRect without changing the kernel
* structure! */
typedef struct _XF86DRIClipRect {
unsigned short x1; /* Upper left: inclusive */
unsigned short y1;
unsigned short x2; /* Lower right: exclusive */
unsigned short y2;
} XF86DRIClipRectRec, *XF86DRIClipRectPtr;
#ifndef _XF86DRI_SERVER_ #ifndef _XF86DRI_SERVER_
_XFUNCPROTOBEGIN _XFUNCPROTOBEGIN
@@ -192,11 +184,11 @@ Bool XF86DRIGetDrawableInfo(
int* /* W */, int* /* W */,
int* /* H */, int* /* H */,
int* /* numClipRects */, int* /* numClipRects */,
XF86DRIClipRectPtr*,/* pClipRects */ drm_clip_rect_t*, /* pClipRects */
int* /* backX */, int* /* backX */,
int* /* backY */, int* /* backY */,
int* /* numBackClipRects */, int* /* numBackClipRects */,
XF86DRIClipRectPtr* /* pBackClipRects */ drm_clip_rect_t* /* pBackClipRects */
#endif #endif
); );

2
src/mesa/drivers/dri/i810/server/i810_dri.h
View File

@@ -78,7 +78,7 @@ typedef struct {
unsigned int dirty; unsigned int dirty;
unsigned int nbox; unsigned int nbox;
XF86DRIClipRectRec boxes[I810_NR_SAREA_CLIPRECTS]; drm_clip_rect_t boxes[I810_NR_SAREA_CLIPRECTS];
/* Maintain an LRU of contiguous regions of texture space. If /* Maintain an LRU of contiguous regions of texture space. If
* you think you own a region of texture memory, and it has an * you think you own a region of texture memory, and it has an