From 566208a2651b0c063ecc37413d6923ab677ad90d Mon Sep 17 00:00:00 2001 From: "SND\\weimingzhi_cp" Date: Fri, 9 Jul 2010 05:11:21 +0000 Subject: [PATCH] git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@54395 e17a0e51-4ae3-4d35-97c3-1a29b211df97 --- ChangeLog | 1 + plugins/peopsxgl/draw.c | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/ChangeLog b/ChangeLog index da0e6aee..1205f5a4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,7 @@ July 9, 2010 Wei Mingzhi * plugins/dfcdrom/cdr-linux.c: Likewise. * plugins/dfcdrom/cdrcfg-0.1df/main.c: Added device listing for Solaris. * configure.ac: Fixed FTBFS on Solaris. + * plugins/peopsxgl/draw.c: Don't use glColorTableEXT on Solaris. July 8, 2010 Wei Mingzhi diff --git a/plugins/peopsxgl/draw.c b/plugins/peopsxgl/draw.c index 1d73769c..d0b70748 100644 --- a/plugins/peopsxgl/draw.c +++ b/plugins/peopsxgl/draw.c @@ -168,6 +168,7 @@ void GetExtInfos(void) glColorTableEXTEx=(PFNGLCOLORTABLEEXT)NULL; // init ogl palette func pointer +#ifndef __sun if(iGPUHeight!=1024 && // no pal textures in ZN mode (height=1024)! strstr((char *)glGetString(GL_EXTENSIONS), // otherwise: check ogl support "GL_EXT_paletted_texture")) @@ -179,6 +180,9 @@ void GetExtInfos(void) if(glColorTableEXTEx==NULL) iUsePalTextures=0; // -> ha, cheater... no func, no support } else iUsePalTextures=0; +#else + iUsePalTextures=0; +#endif } ////////////////////////////////////////////////////////////////////////