xserver: Branch 'xorg-server-1.4-apple' - 2 commits
Jeremy Huddleston
jeremyhu at kemper.freedesktop.org
Sun Feb 1 15:08:37 PST 2009
hw/xquartz/GL/indirect.c | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
New commits:
commit e01662cadcaa4052e3a5aa82cbaed00a2d0220e0
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date: Sun Feb 1 15:08:02 2009 -0800
XQuartz: GLX: OpenGL.framework on Tiger doesn't have glBlitFramebufferEXT
diff --git a/hw/xquartz/GL/indirect.c b/hw/xquartz/GL/indirect.c
index f90240a..c4e2824 100644
--- a/hw/xquartz/GL/indirect.c
+++ b/hw/xquartz/GL/indirect.c
@@ -1291,7 +1291,9 @@ static void setup_dispatch_table(void) {
SET_BlendEquationSeparateEXT(disp, glBlendEquationSeparateEXT);
SET_BlendFunc(disp, glBlendFunc);
SET_BlendFuncSeparateEXT(disp, glBlendFuncSeparateEXT);
+#if MAC_OS_X_VERSION_MIN_REQUIRED > 1050
SET_BlitFramebufferEXT(disp, glBlitFramebufferEXT);
+#endif
SET_BufferDataARB(disp, glBufferDataARB);
SET_BufferSubDataARB(disp, glBufferSubDataARB);
SET_CallList(disp, glCallList);
commit e2450a42272c8f888995115abd51e6fb05c34c85
Author: George Staplin <gstaplin at apple.com>
Date: Mon Jan 26 03:02:38 2009 -0700
XQuartz: GL: indirect.c changes to fix the build with newer OpenGL frameworks.
(cherry picked from commit 143224405ba74929c702a95de52b56df140b0d1b)
(cherry picked from commit 92f00abc1f519f065d07699b9f150b1f93567be8)
diff --git a/hw/xquartz/GL/indirect.c b/hw/xquartz/GL/indirect.c
index 504b637..f90240a 100644
--- a/hw/xquartz/GL/indirect.c
+++ b/hw/xquartz/GL/indirect.c
@@ -37,6 +37,13 @@
#include "dri.h"
+#include <AvailabilityMacros.h>
+
+/*
+ * These define seem questionable to me, but I'm not sure why they were here
+ * in the first place.
+ */
+#if MAC_OS_X_VERSION_MIN_REQUIRED < 1060
#define GL_EXT_histogram 1
#define GL_EXT_polygon_offset 1
#define GL_SGIS_pixel_texture 1
@@ -53,6 +60,7 @@
#define GL_APPLE_fence 1
#define GL_IBM_multimode_draw_arrays 1
#define GL_EXT_fragment_shader 1
+#endif
#include <OpenGL/OpenGL.h>
#include <OpenGL/CGLContext.h>
@@ -1340,12 +1348,16 @@ static void setup_dispatch_table(void) {
SET_ColorTable(disp, glColorTable);
SET_ColorTableParameterfv(disp, glColorTableParameterfv);
SET_ColorTableParameteriv(disp, glColorTableParameteriv);
+
+
+#if MAC_OS_X_VERSION_MIN_REQUIRED < 1060
SET_CombinerInputNV(disp, glCombinerInputNV);
SET_CombinerOutputNV(disp, glCombinerOutputNV);
SET_CombinerParameterfNV(disp, glCombinerParameterfNV);
SET_CombinerParameterfvNV(disp, glCombinerParameterfvNV);
SET_CombinerParameteriNV(disp, glCombinerParameteriNV);
SET_CombinerParameterivNV(disp, glCombinerParameterivNV);
+#endif
SET_CompileShaderARB(disp, glCompileShaderARB);
SET_CompressedTexImage1DARB(disp, glCompressedTexImage1DARB);
SET_CompressedTexImage2DARB(disp, glCompressedTexImage2DARB);
@@ -1423,7 +1435,10 @@ static void setup_dispatch_table(void) {
SET_EvalPoint2(disp, glEvalPoint2);
//SET_ExecuteProgramNV(disp, glExecuteProgramNV);
SET_FeedbackBuffer(disp, glFeedbackBuffer);
+
+#if MAC_OS_X_VERSION_MIN_REQUIRED < 1060
SET_FinalCombinerInputNV(disp, glFinalCombinerInputNV);
+#endif
SET_Finish(disp, glFinish);
SET_FinishFenceNV(disp, glFinishFenceAPPLE); // <-- APPLE -> NV
SET_Flush(disp, glFlush);
@@ -1465,10 +1480,12 @@ static void setup_dispatch_table(void) {
SET_GetColorTable(disp, glGetColorTable);
SET_GetColorTableParameterfv(disp, glGetColorTableParameterfv);
SET_GetColorTableParameteriv(disp, glGetColorTableParameteriv);
+#if MAC_OS_X_VERSION_MIN_REQUIRED < 1060
SET_GetCombinerInputParameterfvNV(disp, glGetCombinerInputParameterfvNV);
SET_GetCombinerInputParameterivNV(disp, glGetCombinerInputParameterivNV);
SET_GetCombinerOutputParameterfvNV(disp, glGetCombinerOutputParameterfvNV);
SET_GetCombinerOutputParameterivNV(disp, glGetCombinerOutputParameterivNV);
+#endif
SET_GetCompressedTexImageARB(disp, glGetCompressedTexImageARB);
SET_GetConvolutionFilter(disp, glGetConvolutionFilter);
SET_GetConvolutionParameterfv(disp, glGetConvolutionParameterfv);
@@ -1476,8 +1493,10 @@ static void setup_dispatch_table(void) {
SET_GetDoublev(disp, glGetDoublev);
SET_GetError(disp, glGetError);
//SET_GetFenceivNV(disp, glGetFenceivNV);
+#if MAC_OS_X_VERSION_MIN_REQUIRED < 1060
SET_GetFinalCombinerInputParameterfvNV(disp, glGetFinalCombinerInputParameterfvNV);
SET_GetFinalCombinerInputParameterivNV(disp, glGetFinalCombinerInputParameterivNV);
+#endif
SET_GetFloatv(disp, glGetFloatv);
SET_GetFramebufferAttachmentParameterivEXT(disp, glGetFramebufferAttachmentParameterivEXT);
SET_GetHandleARB(disp, glGetHandleARB);
More information about the xorg-commit
mailing list