adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

VC6 does not allow ptr arithmetic on void*; casting pixels to Uint32* for cleaner ptr arith

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2651 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
avolkov
2007-01-09 07:58:22 +00:00
parent a48264e504
commit f8670f22ed
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/sc2code/libs/graphics/sdl/opengl.c
+4 -4
View File
@@ -348,8 +348,8 @@ TFB_GL_SwapBuffers (int force_full_redraw)
SDL_LockSurface (scaled_display); SDL_LockSurface (scaled_display);
glTexSubImage2D (GL_TEXTURE_2D, 0, updated.x * 2, updated.y * 2, glTexSubImage2D (GL_TEXTURE_2D, 0, updated.x * 2, updated.y * 2,
updated.w * 2, updated.h * 2, GL_RGBA, GL_UNSIGNED_BYTE, updated.w * 2, updated.h * 2, GL_RGBA, GL_UNSIGNED_BYTE,
scaled_display->pixels + (Uint32*)scaled_display->pixels +
(updated.y * 16 * ScreenWidth + updated.x * 8)); (updated.y * 4 * ScreenWidth + updated.x * 2));
SDL_UnlockSurface (scaled_display); SDL_UnlockSurface (scaled_display);
} }
else else
@@ -362,8 +362,8 @@ TFB_GL_SwapBuffers (int force_full_redraw)
SDL_LockSurface (SDL_Screen); SDL_LockSurface (SDL_Screen);
glTexSubImage2D (GL_TEXTURE_2D, 0, updated.x, updated.y, glTexSubImage2D (GL_TEXTURE_2D, 0, updated.x, updated.y,
updated.w, updated.h, GL_RGBA, GL_UNSIGNED_BYTE, updated.w, updated.h, GL_RGBA, GL_UNSIGNED_BYTE,
SDL_Screen->pixels + (Uint32*)SDL_Screen->pixels +
(updated.y * 4 * ScreenWidth + updated.x * 4)); (updated.y * ScreenWidth + updated.x));
SDL_UnlockSurface (SDL_Screen); SDL_UnlockSurface (SDL_Screen);
} }
} }