fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2026-01-16 06:30:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use final EXT_tfp tokens

Browse source
This commit is contained in:
David Reveman 2006-05-02 08:56:52 +00:00
parent 79b1c4bc41
commit 54bf65fcbd
5 changed files with 5 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
GL/glx/glxcmds.c
View file

@ -1681,7 +1681,7 @@ DoGetDrawableAttributes(__GLXclientState *cl, XID drawId)
reply.numAttribs = numAttribs;
attributes[0] = GLX_TEXTURE_TARGET_EXT;
attributes[1] = GLX_NO_TEXTURE_EXT;
attributes[1] = GLX_TEXTURE_RECTANGLE_EXT;
glxScreen = glxPixmap->pGlxScreen;
if (glxScreen->textureFromPixmap)

1
GL/glx/glxdri.c
View file

@ -35,6 +35,7 @@
#include <drm.h>
#include <GL/gl.h>
#include <GL/internal/dri_interface.h>
#include <GL/glxtokens.h>
#include <windowstr.h>
#include <os.h>

16
GL/glx/glxserver.h
View file

@ -63,22 +63,6 @@
#include <GL/glxproto.h>
#include <GL/glxint.h>
#ifndef GLX_TEXTURE_TARGET_EXT
#define GLX_TEXTURE_TARGET_EXT 0x6001
#define GLX_TEXTURE_2D_EXT 0x6002
#define GLX_TEXTURE_RECTANGLE_EXT 0x6003
#define GLX_NO_TEXTURE_EXT 0x6004
#define GLX_FRONT_LEFT_EXT 0x6005
#define GLX_TEXTURE_FORMAT_EXT 0x6006
#define GLX_TEXTURE_FORMAT_RGB_EXT 0x6007
#define GLX_TEXTURE_FORMAT_RGBA_EXT 0x6008
#define GLX_Y_INVERTED_EXT 0x6009
#define GLX_BIND_TO_TEXTURE_RGB_EXT 0x600A
#define GLX_BIND_TO_TEXTURE_RGBA_EXT 0x600B
#define GLX_BIND_TO_MIPMAP_TEXTURE_EXT 0x600C
#define GLX_MIPMAP_TEXTURE_EXT 0x600D
#endif
/* For glxscreens.h */
typedef struct __GLXdrawable __GLXdrawable;
typedef struct __GLXcontext __GLXcontext;

2
configure.ac
View file

@ -565,7 +565,7 @@ fi
if test "x$GLX" = xyes && ! test "x$MESA_SOURCE" = x; then
PKG_CHECK_MODULES([XLIB], [x11])
PKG_CHECK_MODULES([GL], [glproto >= 1.4.6])
PKG_CHECK_MODULES([GL], [glproto >= 1.4.7])
AC_SUBST(XLIB_CFLAGS)
AC_DEFINE(GLXEXT, 1, [Build GLX extension])
GLX_LIBS='$(top_builddir)/GL/glx/libglx.la $(top_builddir)/GL/mesa/libGLcore.la'

3
hw/xgl/glxext/xglglxext.c
View file

@ -30,6 +30,7 @@
#include <GL/gl.h>
#include <GL/glext.h>
#include <GL/internal/glcore.h>
#include <GL/glxtokens.h>
#include "glxserver.h"
#include "glxdrawable.h"
@ -6310,7 +6311,7 @@ static int
xglGetTexTarget (__GLXscreen *screen,
__GLXpixmap *pixmap)
{
int target = GLX_NO_TEXTURE_EXT;
int target = GLX_TEXTURE_2D_EXT;
XGL_DRAWABLE_PIXMAP (pixmap->pDraw);