diff options
| author | marha <marha@users.sourceforge.net> | 2010-12-27 09:28:00 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-12-27 09:28:00 +0000 |
| commit | 936d40bb3e65fd7f8734be8aaf431f9241d7f5bc (patch) | |
| tree | d95f61b8e0280fc4f7cf9f0021a82521a6008597 | |
| parent | 8f1afd266a69c5454dccf130e8522575c7aecae8 (diff) | |
| download | vcxsrv-936d40bb3e65fd7f8734be8aaf431f9241d7f5bc.tar.gz vcxsrv-936d40bb3e65fd7f8734be8aaf431f9241d7f5bc.tar.bz2 vcxsrv-936d40bb3e65fd7f8734be8aaf431f9241d7f5bc.zip | |
Use gl.h of mesa library
| -rw-r--r-- | xorg-server/glx/indirect_size_get.c | 2 | ||||
| -rw-r--r-- | xorg-server/glx/makefile | 2 | ||||
| -rw-r--r-- | xorg-server/glx/rensize.c | 6 |
3 files changed, 2 insertions, 8 deletions
diff --git a/xorg-server/glx/indirect_size_get.c b/xorg-server/glx/indirect_size_get.c index 8a574995d..9f0a2d580 100644 --- a/xorg-server/glx/indirect_size_get.c +++ b/xorg-server/glx/indirect_size_get.c @@ -901,9 +901,7 @@ __glGetTexLevelParameterfv_size( GLenum e ) case GL_TEXTURE_INTENSITY_SIZE:
/* case GL_TEXTURE_INTENSITY_SIZE_EXT:*/
case GL_TEXTURE_DEPTH:
-#ifndef _MSC_VER
case GL_TEXTURE_INDEX_SIZE_EXT:
-#endif
case GL_TEXTURE_COMPRESSED_IMAGE_SIZE:
/* case GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB:*/
case GL_TEXTURE_COMPRESSED:
diff --git a/xorg-server/glx/makefile b/xorg-server/glx/makefile index 6146b991c..68426af2b 100644 --- a/xorg-server/glx/makefile +++ b/xorg-server/glx/makefile @@ -42,3 +42,5 @@ CSRCS = \ swap_interval.c \
xfont.c
+INCLUDES := $(MHMAKECONF)\mesalib\include $(INCLUDES)
+
diff --git a/xorg-server/glx/rensize.c b/xorg-server/glx/rensize.c index 6b85dc116..1dc2407b0 100644 --- a/xorg-server/glx/rensize.c +++ b/xorg-server/glx/rensize.c @@ -223,9 +223,7 @@ int __glXImageSize( GLenum format, GLenum type, GLenum target, case GL_422_AVERAGE_EXT: case GL_422_REV_AVERAGE_EXT: case GL_DEPTH_STENCIL_NV: -#ifndef _MSC_VER case GL_DEPTH_STENCIL_MESA: -#endif case GL_YCBCR_MESA: case GL_LUMINANCE_ALPHA: elementsPerGroup = 2; @@ -264,13 +262,11 @@ int __glXImageSize( GLenum format, GLenum type, GLenum target, case GL_UNSIGNED_SHORT_1_5_5_5_REV: case GL_UNSIGNED_SHORT_8_8_APPLE: case GL_UNSIGNED_SHORT_8_8_REV_APPLE: -#ifndef _MSC_VER case GL_UNSIGNED_SHORT_15_1_MESA: case GL_UNSIGNED_SHORT_1_15_REV_MESA: bytesPerElement = 2; elementsPerGroup = 1; break; -#endif case GL_INT: case GL_UNSIGNED_INT: case GL_FLOAT: @@ -281,10 +277,8 @@ int __glXImageSize( GLenum format, GLenum type, GLenum target, case GL_UNSIGNED_INT_10_10_10_2: case GL_UNSIGNED_INT_2_10_10_10_REV: case GL_UNSIGNED_INT_24_8_NV: -#ifndef _MSC_VER case GL_UNSIGNED_INT_24_8_MESA: case GL_UNSIGNED_INT_8_24_REV_MESA: -#endif bytesPerElement = 4; elementsPerGroup = 1; break; |