mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2025-12-25 19:30:11 +01:00
Fix compile problems with `glMultiModeDrawArraysIBM'
Adjust makefiles to create depends and not store it in CVS Remove dependency on kernel pci_ids.h
This commit is contained in:
Jon Smirl
parent
d620015abd
commit
dc22a652c9
6 changed files with 83 additions and 19 deletions
10
Makefile.X11
10
Makefile.X11
|
|
@ -1,4 +1,4 @@
|
|||
# $Id: Makefile.X11,v 1.80 2003/08/22 20:11:43 brianp Exp $
|
||||
# $Id: Makefile.X11,v 1.81 2003/08/24 04:44:23 jonsmirl Exp $
|
||||
|
||||
# Mesa 3-D graphics library
|
||||
# Version: 5.1
|
||||
|
|
@ -234,6 +234,14 @@ linux-solo:
|
|||
if [ -d src/glx/mini ] ; then touch src/glx/mini/depend ; fi
|
||||
if [ -d src/glu/mini ] ; then touch src/glu/mini/depend ; fi
|
||||
if [ -d src/glut/mini ] ; then touch src/glut/mini/depend ; fi
|
||||
if [ -d src/mesa/drivers/dri/r200 ] ; then touch src/mesa/drivers/dri/r200/depend ; fi
|
||||
if [ -d src/mesa/drivers/dri/r128 ] ; then touch src/mesa/drivers/dri/r128/depend ; fi
|
||||
if [ -d src/mesa/drivers/dri/radeon ] ; then touch src/mesa/drivers/dri/radeon/depend ; fi
|
||||
if [ -d src/mesa/drivers/dri/mga ] ; then touch src/mesa/drivers/dri/mga/depend ; fi
|
||||
if [ -d src/mesa/drivers/dri/fb ] ; then touch src/mesa/drivers/dri/fb/depend ; fi
|
||||
if [ -d src/glut/mini ] ; then touch src/glut/mini/depend ; fi
|
||||
if [ -d progs/miniglx ] ; then touch progs/miniglx/depend ; fi
|
||||
if [ -d progs/tests ] ; then touch progs/tests/depend ; fi
|
||||
if [ -d src/mesa ] ; then cd src/mesa ; $(MAKE) -f Makefile.X11 $@ ; fi
|
||||
if [ -d src/mesa/drivers/dri/r200 ] ; then cd src/mesa/drivers/dri/r200 ; $(MAKE) -f Makefile.X11 $@ ; fi
|
||||
if [ -d src/mesa/drivers/dri/r128 ] ; then cd src/mesa/drivers/dri/r128 ; $(MAKE) -f Makefile.X11 $@ ; fi
|
||||
|
|
|
|||
|
|
@ -4553,9 +4553,9 @@ typedef void (APIENTRY * PFNGLWINDOWPOS4SVMESAPROC) (const GLshort *v);
|
|||
|
||||
#ifndef GL_IBM_multimode_draw_arrays
|
||||
#define GL_IBM_multimode_draw_arrays 1
|
||||
#ifdef GL_GLEXT_PROTOTYPES
|
||||
GLAPI void APIENTRY glMultiModeDrawArraysIBM (GLenum, const GLint *, const GLsizei *, GLsizei, GLint);
|
||||
GLAPI void APIENTRY glMultiModeDrawElementsIBM (const GLenum *, const GLsizei *, GLenum, const GLvoid* *, GLsizei, GLint);
|
||||
#ifdef GL_GLEXT_PROTOTYPES
|
||||
GLAPI void APIENTRY glMultiModeDrawArraysIBM (const GLenum *, const GLint *, const GLsizei *, GLsizei, GLint);
|
||||
GLAPI void APIENTRY glMultiModeDrawElementsIBM (const GLenum *, const GLsizei *, GLenum, const GLvoid * const *, GLsizei, GLint);
|
||||
#endif /* GL_GLEXT_PROTOTYPES */
|
||||
typedef void (APIENTRY * PFNGLMULTIMODEDRAWARRAYSIBMPROC) (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount, GLint modestride);
|
||||
typedef void (APIENTRY * PFNGLMULTIMODEDRAWELEMENTSIBMPROC) (const GLenum *mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount, GLint modestride);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $Id: Makefile.X11,v 1.2 2003/08/22 20:11:44 brianp Exp $
|
||||
# $Id: Makefile.X11,v 1.3 2003/08/24 04:44:23 jonsmirl Exp $
|
||||
|
||||
# Mesa 3-D graphics library
|
||||
# Version: 5.0
|
||||
|
|
@ -102,7 +102,7 @@ mga_dri.so: $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile.X11
|
|||
# Run 'make -f Makefile.X11 dep' to update the dependencies if you change
|
||||
# what's included by any source file.
|
||||
depend: $(C_SOURCES) $(ASM_SOURCES)
|
||||
makedepend -fdepend -Y $(SHARED_INCLUDES) \
|
||||
makedepend -fdepend -Y $(SHARED_INCLUDES) $(MINIGLX_INCLUDES) \
|
||||
$(C_SOURCES) $(ASM_SOURCES)
|
||||
|
||||
|
||||
|
|
|
|||
57
src/mesa/drivers/dri/r128/server/pci_ids.h
Normal file
57
src/mesa/drivers/dri/r128/server/pci_ids.h
Normal file
|
|
@ -0,0 +1,57 @@
|
|||
/* Rage128 M3 */
|
||||
#define PCI_DEVICE_ID_ATI_RAGE128_LE 0x4c45
|
||||
#define PCI_DEVICE_ID_ATI_RAGE128_LF 0x4c46
|
||||
/* Rage128 M4 */
|
||||
#define PCI_DEVICE_ID_ATI_RAGE128_MF 0x4d46
|
||||
#define PCI_DEVICE_ID_ATI_RAGE128_ML 0x4d4c
|
||||
/* Rage128 Pro GL */
|
||||
#define PCI_DEVICE_ID_ATI_RAGE128_PA 0x5041
|
||||
#define PCI_DEVICE_ID_ATI_RAGE128_PB 0x5042
|
||||
#define PCI_DEVICE_ID_ATI_RAGE128_PC 0x5043
|
||||
#define PCI_DEVICE_ID_ATI_RAGE128_PD 0x5044
|
||||
#define PCI_DEVICE_ID_ATI_RAGE128_PE 0x5045
|
||||
#define PCI_DEVICE_ID_ATI_RAGE128_PF 0x5046
|
||||
/* Rage128 Pro VR */
|
||||
#define PCI_DEVICE_ID_ATI_RAGE128_PG 0x5047
|
||||
#define PCI_DEVICE_ID_ATI_RAGE128_PH 0x5048
|
||||
#define PCI_DEVICE_ID_ATI_RAGE128_PI 0x5049
|
||||
#define PCI_DEVICE_ID_ATI_RAGE128_PJ 0x504A
|
||||
#define PCI_DEVICE_ID_ATI_RAGE128_PK 0x504B
|
||||
#define PCI_DEVICE_ID_ATI_RAGE128_PL 0x504C
|
||||
#define PCI_DEVICE_ID_ATI_RAGE128_PM 0x504D
|
||||
#define PCI_DEVICE_ID_ATI_RAGE128_PN 0x504E
|
||||
#define PCI_DEVICE_ID_ATI_RAGE128_PO 0x504F
|
||||
#define PCI_DEVICE_ID_ATI_RAGE128_PP 0x5050
|
||||
#define PCI_DEVICE_ID_ATI_RAGE128_PQ 0x5051
|
||||
#define PCI_DEVICE_ID_ATI_RAGE128_PR 0x5052
|
||||
#define PCI_DEVICE_ID_ATI_RAGE128_TR 0x5452
|
||||
#define PCI_DEVICE_ID_ATI_RAGE128_PS 0x5053
|
||||
#define PCI_DEVICE_ID_ATI_RAGE128_PT 0x5054
|
||||
#define PCI_DEVICE_ID_ATI_RAGE128_PU 0x5055
|
||||
#define PCI_DEVICE_ID_ATI_RAGE128_PV 0x5056
|
||||
#define PCI_DEVICE_ID_ATI_RAGE128_PW 0x5057
|
||||
#define PCI_DEVICE_ID_ATI_RAGE128_PX 0x5058
|
||||
/* Rage128 GL */
|
||||
#define PCI_DEVICE_ID_ATI_RAGE128_RE 0x5245
|
||||
#define PCI_DEVICE_ID_ATI_RAGE128_RF 0x5246
|
||||
/* Rage128 VR */
|
||||
#define PCI_DEVICE_ID_ATI_RAGE128_RE 0x5245
|
||||
#define PCI_DEVICE_ID_ATI_RAGE128_RF 0x5246
|
||||
#define PCI_DEVICE_ID_ATI_RAGE128_RG 0x5247
|
||||
#define PCI_DEVICE_ID_ATI_RAGE128_RK 0x524b
|
||||
#define PCI_DEVICE_ID_ATI_RAGE128_RL 0x524c
|
||||
#define PCI_DEVICE_ID_ATI_RAGE128_SE 0x5345
|
||||
#define PCI_DEVICE_ID_ATI_RAGE128_SF 0x5346
|
||||
#define PCI_DEVICE_ID_ATI_RAGE128_SG 0x5347
|
||||
#define PCI_DEVICE_ID_ATI_RAGE128_SH 0x5348
|
||||
#define PCI_DEVICE_ID_ATI_RAGE128_SK 0x534b
|
||||
#define PCI_DEVICE_ID_ATI_RAGE128_SL 0x534c
|
||||
#define PCI_DEVICE_ID_ATI_RAGE128_SM 0x534d
|
||||
#define PCI_DEVICE_ID_ATI_RAGE128_SN 0x534e
|
||||
/* Rage128 Pro Ultra */
|
||||
#define PCI_DEVICE_ID_ATI_RAGE128_TF 0x5446
|
||||
#define PCI_DEVICE_ID_ATI_RAGE128_TL 0x544C
|
||||
#define PCI_DEVICE_ID_ATI_RAGE128_TR 0x5452
|
||||
#define PCI_DEVICE_ID_ATI_RAGE128_TS 0x5453
|
||||
#define PCI_DEVICE_ID_ATI_RAGE128_TT 0x5454
|
||||
#define PCI_DEVICE_ID_ATI_RAGE128_TU 0x5455
|
||||
|
|
@ -43,7 +43,8 @@
|
|||
#include <string.h>
|
||||
#include <errno.h>
|
||||
#include <unistd.h>
|
||||
#include <linux/pci_ids.h>
|
||||
// Fix this to use kernel pci_ids.h when all of these IDs make it into the kernel
|
||||
#include "pci_ids.h"
|
||||
|
||||
#include "driver.h"
|
||||
#include "drm.h"
|
||||
|
|
|
|||
|
|
@ -3511,8 +3511,16 @@ KEYWORD1 void KEYWORD2 NAME(WindowPos4svMESA)(const GLshort * v)
|
|||
DISPATCH(WindowPos4svMESA, (v), (F, "glWindowPos4svMESA(%p);\n", (const void *) v));
|
||||
}
|
||||
|
||||
/* No dispatch for MultiModeDrawArraysIBM() */
|
||||
/* No dispatch for MultiModeDrawElementsIBM() */
|
||||
KEYWORD1 void KEYWORD2 NAME(MultiModeDrawArraysIBM)(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride)
|
||||
{
|
||||
DISPATCH(MultiModeDrawArraysIBM, (mode, first, count, primcount, modestride), (F, "glMultiModeDrawArraysIBM(%p, %p, %p, %d, %d);\n", (const void *) mode, (const void *) first, (const void *) count, primcount, modestride));
|
||||
}
|
||||
|
||||
KEYWORD1 void KEYWORD2 NAME(MultiModeDrawElementsIBM)(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride)
|
||||
{
|
||||
DISPATCH(MultiModeDrawElementsIBM, (mode, count, type, indices, primcount, modestride), (F, "glMultiModeDrawElementsIBM(%p, %p, 0x%x, %p, %d, %d);\n", (const void *) mode, (const void *) count, type, (const void *) indices, primcount, modestride));
|
||||
}
|
||||
|
||||
/* No dispatch for ColorPointerListIBM() */
|
||||
/* No dispatch for SecondaryColorPointerListIBM() */
|
||||
/* No dispatch for EdgeFlagPointerListIBM() */
|
||||
|
|
@ -4664,16 +4672,6 @@ KEYWORD1 void KEYWORD2 NAME(GetQueryObjectuivARB)(GLuint id, GLenum pname, GLuin
|
|||
DISPATCH(GetQueryObjectuivARB, (id, pname, params), (F, "glGetQueryObjectuivARB(%d, 0x%x, %p);\n", id, pname, (const void *) params));
|
||||
}
|
||||
|
||||
KEYWORD1 void KEYWORD2 NAME(MultiModeDrawArraysIBM)(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride)
|
||||
{
|
||||
DISPATCH(MultiModeDrawArraysIBM, (mode, first, count, primcount, modestride), (F, "glMultiModeDrawArraysIBM(%p, %p, %p, %d, %d);\n", (const void *) mode, (const void *) first, (const void *) count, primcount, modestride));
|
||||
}
|
||||
|
||||
KEYWORD1 void KEYWORD2 NAME(MultiModeDrawElementsIBM)(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride)
|
||||
{
|
||||
DISPATCH(MultiModeDrawElementsIBM, (mode, count, type, indices, primcount, modestride), (F, "glMultiModeDrawElementsIBM(%p, %p, 0x%x, %p, %d, %d);\n", (const void *) mode, (const void *) count, type, (const void *) indices, primcount, modestride));
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue