jetomit/avp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

GL_EXT_secondary_color now spelled correctly (Tim Beckmann)

Browse source 
Progress Bar drawing hopefully fixed.
This commit is contained in:
Steven Fuller 2001-12-10 01:28:06 +00:00 • committed by Patryk Obara
parent 7501334b9b
commit 5e99463577
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/main.c
View file

@ -506,8 +506,8 @@ int SetOGLVideoMode(int Width, int Height)
#if GL_EXT_secondary_color #if GL_EXT_secondary_color
pglSecondaryColorPointerEXT = NULL; pglSecondaryColorPointerEXT = NULL;
if (CheckToken(ext, "GL_EXT_seconary_color")) { if (CheckToken(ext, "GL_EXT_secondary_color")) {
printf("Found GL_EXT_seconary_color... "); printf("Found GL_EXT_secondary_color... ");
pglSecondaryColorPointerEXT = SDL_GL_GetProcAddress("glSecondaryColorPointerEXT"); pglSecondaryColorPointerEXT = SDL_GL_GetProcAddress("glSecondaryColorPointerEXT");
if (pglSecondaryColorPointerEXT == NULL) { if (pglSecondaryColorPointerEXT == NULL) {
@ -516,7 +516,7 @@ int SetOGLVideoMode(int Width, int Height)
printf("and it's good!\n"); printf("and it's good!\n");
} }
} else { } else {
printf("GL_EXT_seconary_color not found...\n"); printf("GL_EXT_secondary_color not found...\n");
} }
#endif #endif

4
src/opengl.c
View file

@ -2506,10 +2506,12 @@ void BltImage(RECT *dest, DDSurface *image, RECT *src)
height = dest->bottom - dest->top + 1; height = dest->bottom - dest->top + 1;
height1 = src->bottom - src->top + 1; height1 = src->bottom - src->top + 1;
glPushAttrib(GL_COLOR_BUFFER_BIT | GL_PIXEL_MODE_BIT); glPushAttrib(GL_COLOR_BUFFER_BIT | GL_PIXEL_MODE_BIT | GL_DEPTH_BUFFER_BIT | GL_ENABLE_BIT);
glPushClientAttrib(GL_CLIENT_PIXEL_STORE_BIT); glPushClientAttrib(GL_CLIENT_PIXEL_STORE_BIT);
glDisable(GL_BLEND); glDisable(GL_BLEND);
glDisable(GL_DEPTH_TEST);
glDisable(GL_TEXTURE_2D);
glPixelStorei(GL_UNPACK_ALIGNMENT, 1); glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
glPixelStorei(GL_UNPACK_ROW_LENGTH, image->w); glPixelStorei(GL_UNPACK_ROW_LENGTH, image->w);