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

more GL 1.3 and GLX 1.4 updates

Browse Source
This commit is contained in:
Brian Paul
2001-09-14 02:43:03 +00:00
parent dcbe4d6d2f
commit ba57e5297d
5 changed files with 34 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/GL/glx.h
View File

@@ -1,4 +1,4 @@
/* $Id: glx.h,v 1.30 2001/09/01 20:17:16 brianp Exp $ */ /* $Id: glx.h,v 1.31 2001/09/14 02:43:04 brianp Exp $ */
/* /*
* Mesa 3-D graphics library * Mesa 3-D graphics library
@@ -60,6 +60,7 @@ extern "C" {
#define GLX_VERSION_1_1 1 #define GLX_VERSION_1_1 1
#define GLX_VERSION_1_2 1 #define GLX_VERSION_1_2 1
#define GLX_VERSION_1_3 1 #define GLX_VERSION_1_3 1
#define GLX_VERSION_1_4 1
#define GLX_EXTENSION_NAME "GLX" #define GLX_EXTENSION_NAME "GLX"
@@ -169,6 +170,13 @@ extern "C" {
#define GLX_PBUFFER_WIDTH 0x8041 #define GLX_PBUFFER_WIDTH 0x8041
/*
* GLX 1.4 and later:
*/
#define GLX_SAMPLE_BUFFERS_SGIS 100000
#define GLX_SAMPLES_SGIS 100001
typedef struct __GLXcontextRec *GLXContext; typedef struct __GLXcontextRec *GLXContext;
typedef XID GLXPixmap; typedef XID GLXPixmap;
@@ -286,6 +294,10 @@ extern void glXGetSelectedEvent( Display *dpy, GLXDrawable drawable,
unsigned long *mask ); unsigned long *mask );
/* GLX 1.4 and later */
extern void (*glXGetProcAddress(const GLubyte *procname))();
#ifndef GLX_GLXEXT_LEGACY #ifndef GLX_GLXEXT_LEGACY

6
src/mesa/Makefile.X11
View File

@@ -1,7 +1,7 @@
# $Id: Makefile.X11,v 1.56 2001/07/12 22:09:21 keithw Exp $ # $Id: Makefile.X11,v 1.57 2001/09/14 02:43:03 brianp Exp $
# Mesa 3-D graphics library # Mesa 3-D graphics library
# Version: 3.5 # Version: 3.5.1
# Copyright (C) 1995-2001 Brian Paul # Copyright (C) 1995-2001 Brian Paul
# Makefile for core library # Makefile for core library
@@ -10,7 +10,7 @@
##### MACROS ##### ##### MACROS #####
GL_MAJOR = 1 GL_MAJOR = 1
GL_MINOR = 2 GL_MINOR = 3
GL_TINY = 0$(MESA_MAJOR)0$(MESA_MINOR)0$(MESA_TINY) GL_TINY = 0$(MESA_MAJOR)0$(MESA_MINOR)0$(MESA_TINY)
VPATH = RCS VPATH = RCS

8
src/mesa/drivers/x11/fakeglx.c
View File

@@ -1,4 +1,4 @@
/* $Id: fakeglx.c,v 1.56 2001/09/01 20:23:25 brianp Exp $ */ /* $Id: fakeglx.c,v 1.57 2001/09/14 02:43:04 brianp Exp $ */
/* /*
* Mesa 3-D graphics library * Mesa 3-D graphics library
@@ -57,13 +57,13 @@
/* This indicates the client-side GLX API and GLX encoder version. */ /* This indicates the client-side GLX API and GLX encoder version. */
#define CLIENT_MAJOR_VERSION 1 #define CLIENT_MAJOR_VERSION 1
#define CLIENT_MINOR_VERSION 2 #define CLIENT_MINOR_VERSION 2 /* don't have 1.3's pbuffers, etc yet */
/* This indicates the server-side GLX decoder version. /* This indicates the server-side GLX decoder version.
* GLX 1.3 indicates OpenGL 1.2 support * GLX 1.4 indicates OpenGL 1.3 support
*/ */
#define SERVER_MAJOR_VERSION 1 #define SERVER_MAJOR_VERSION 1
#define SERVER_MINOR_VERSION 3 #define SERVER_MINOR_VERSION 4
/* This is appended onto the glXGetClient/ServerString version strings. */ /* This is appended onto the glXGetClient/ServerString version strings. */
#define MESA_GLX_VERSION "Mesa 3.5.1" #define MESA_GLX_VERSION "Mesa 3.5.1"

12
src/mesa/drivers/x11/glxapi.c
View File

@@ -1,4 +1,4 @@
/* $Id: glxapi.c,v 1.27 2001/05/29 23:15:07 brianp Exp $ */ /* $Id: glxapi.c,v 1.28 2001/09/14 02:43:03 brianp Exp $ */
/* /*
* Mesa 3-D graphics library * Mesa 3-D graphics library
@@ -1253,6 +1253,9 @@ static struct name_address_pair GLX_functions[] = {
{ "glXQueryDrawable", (GLvoid *) glXQueryDrawable }, { "glXQueryDrawable", (GLvoid *) glXQueryDrawable },
{ "glXSelectEvent", (GLvoid *) glXSelectEvent }, { "glXSelectEvent", (GLvoid *) glXSelectEvent },
/*** GLX_VERSION_1_4 ***/
{ "glXGetProcAddress", (GLvoid *) glXGetProcAddress },
/*** GLX_SGI_swap_control ***/ /*** GLX_SGI_swap_control ***/
{ "glXSwapIntervalSGI", (GLvoid *) glXSwapIntervalSGI }, { "glXSwapIntervalSGI", (GLvoid *) glXSwapIntervalSGI },
@@ -1370,3 +1373,10 @@ void (*glXGetProcAddressARB(const GLubyte *procName))()
f = (gl_function) _glapi_get_proc_address((const char *) procName); f = (gl_function) _glapi_get_proc_address((const char *) procName);
return f; return f;
} }
/* GLX 1.4 */
void (*glXGetProcAddress(const GLubyte *procName))()
{
return glXGetProcAddressARB(procName);
}

6
src/mesa/main/Makefile.X11
View File

@@ -1,7 +1,7 @@
# $Id: Makefile.X11,v 1.56 2001/07/12 22:09:21 keithw Exp $ # $Id: Makefile.X11,v 1.57 2001/09/14 02:43:03 brianp Exp $
# Mesa 3-D graphics library # Mesa 3-D graphics library
# Version: 3.5 # Version: 3.5.1
# Copyright (C) 1995-2001 Brian Paul # Copyright (C) 1995-2001 Brian Paul
# Makefile for core library # Makefile for core library
@@ -10,7 +10,7 @@
##### MACROS ##### ##### MACROS #####
GL_MAJOR = 1 GL_MAJOR = 1
GL_MINOR = 2 GL_MINOR = 3
GL_TINY = 0$(MESA_MAJOR)0$(MESA_MINOR)0$(MESA_TINY) GL_TINY = 0$(MESA_MAJOR)0$(MESA_MINOR)0$(MESA_TINY)
VPATH = RCS VPATH = RCS