zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-11-13 07:58:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixes blending in drawrooms and dynamic GLU not compiling in Win32.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@473 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
Plagman 2007-01-26 20:29:36 +00:00
parent 50d1a03dbc
commit 1b5284aee0
4 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
polymer/build/include/glbuild.h
View file

@ -30,6 +30,12 @@
# define APIENTRY # define APIENTRY
#endif #endif
# ifdef _WIN32
# define PR_CALLBACK __stdcall
# else
# define PR_CALLBACK
# endif
// those defines are somehow missing from glext.h // those defines are somehow missing from glext.h
#define GL_FRAMEBUFFER_EXT 0x8D40 #define GL_FRAMEBUFFER_EXT 0x8D40
#define GL_COLOR_ATTACHMENT0_EXT 0x8CE0 #define GL_COLOR_ATTACHMENT0_EXT 0x8CE0
@ -159,7 +165,7 @@ extern void (APIENTRY * bglDeleteFramebuffersEXT)(GLsizei n, const GLuint *frame
// GLU // GLU
extern void (APIENTRY * bgluTessBeginContour) (GLUtesselator* tess); extern void (APIENTRY * bgluTessBeginContour) (GLUtesselator* tess);
extern void (APIENTRY * bgluTessBeginPolygon) (GLUtesselator* tess, GLvoid* data); extern void (APIENTRY * bgluTessBeginPolygon) (GLUtesselator* tess, GLvoid* data);
extern void (APIENTRY * bgluTessCallback) (GLUtesselator* tess, GLenum which, _GLUfuncptr CallBackFunc); extern void (APIENTRY * bgluTessCallback) (GLUtesselator* tess, GLenum which, void (PR_CALLBACK CallBackFunc)());
extern void (APIENTRY * bgluTessEndContour) (GLUtesselator* tess); extern void (APIENTRY * bgluTessEndContour) (GLUtesselator* tess);
extern void (APIENTRY * bgluTessEndPolygon) (GLUtesselator* tess); extern void (APIENTRY * bgluTessEndPolygon) (GLUtesselator* tess);
extern void (APIENTRY * bgluTessNormal) (GLUtesselator* tess, GLdouble valueX, GLdouble valueY, GLdouble valueZ); extern void (APIENTRY * bgluTessNormal) (GLUtesselator* tess, GLdouble valueX, GLdouble valueY, GLdouble valueZ);

6
polymer/build/include/polymer.h
View file

@ -23,12 +23,6 @@
#ifndef _polymer_h_ #ifndef _polymer_h_
# define _polymer_h_ # define _polymer_h_
# ifdef _WIN32
# define PR_CALLBACK __stdcall
# else
# define PR_CALLBACK
# endif
# include "compat.h" # include "compat.h"
# include "build.h" # include "build.h"
# include "glbuild.h" # include "glbuild.h"

2
polymer/build/src/glbuild.c
View file

@ -136,7 +136,7 @@ void (APIENTRY * bglDeleteFramebuffersEXT)(GLsizei n, const GLuint *framebuffers
// GLU // GLU
void (APIENTRY * bgluTessBeginContour) (GLUtesselator* tess); void (APIENTRY * bgluTessBeginContour) (GLUtesselator* tess);
void (APIENTRY * bgluTessBeginPolygon) (GLUtesselator* tess, GLvoid* data); void (APIENTRY * bgluTessBeginPolygon) (GLUtesselator* tess, GLvoid* data);
void (APIENTRY * bgluTessCallback) (GLUtesselator* tess, GLenum which, _GLUfuncptr CallBackFunc); void (APIENTRY * bgluTessCallback) (GLUtesselator* tess, GLenum which, void (PR_CALLBACK CallBackFunc)());
void (APIENTRY * bgluTessEndContour) (GLUtesselator* tess); void (APIENTRY * bgluTessEndContour) (GLUtesselator* tess);
void (APIENTRY * bgluTessEndPolygon) (GLUtesselator* tess); void (APIENTRY * bgluTessEndPolygon) (GLUtesselator* tess);
void (APIENTRY * bgluTessNormal) (GLUtesselator* tess, GLdouble valueX, GLdouble valueY, GLdouble valueZ); void (APIENTRY * bgluTessNormal) (GLUtesselator* tess, GLdouble valueX, GLdouble valueY, GLdouble valueZ);

1
polymer/build/src/polymost.c
View file

@ -3658,6 +3658,7 @@ void polymost_drawrooms ()
resizeglcheck(); resizeglcheck();
//bglClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT); //bglClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT);
bglDisable(GL_BLEND);
bglEnable(GL_TEXTURE_2D); bglEnable(GL_TEXTURE_2D);
//bglTexEnvf(GL_TEXTURE_ENV,GL_TEXTURE_ENV_MODE,GL_MODULATE); //default anyway //bglTexEnvf(GL_TEXTURE_ENV,GL_TEXTURE_ENV_MODE,GL_MODULATE); //default anyway
bglEnable(GL_DEPTH_TEST); bglEnable(GL_DEPTH_TEST);