All pastes #1941625 Raw Edit

ph5

public text v1 · immutable
#1941625 ·published 2010-09-15 20:49 UTC
rendered paste body
Subject: [PATCH 01/18] Changed to GLshort indices for OpenGL ES 1.1, fixed max value to USHRT_MAXThis is not iPhone specific, the ES 1.1 spec doesn't support GL_UNSIGNED_INTin glDrawArrays.Using USHRT_MAX instead of SHRT_MAX doubles the number of available indices.--- src/level.hpp |   12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-)diff --git a/src/level.hpp b/src/level.hppindex f7c724b..945106e 100644--- a/src/level.hpp+++ b/src/level.hpp@@ -356,14 +356,14 @@ private:  		int xbase, ybase; -//the iPhone doesn't seem to support ints being used as indexes in glDrawElements-// -- or at least XCode is saying GL_UNSIGNED_INT is undefined. So use shorts-//on the iPhone. Since we compile tiles on the iPhone and solid colored tiles-//are not counted, this is probably fine.-#if TARGET_OS_IPHONE+//OpenGL ES 1.1 only supports indices of the types GL_UNSIGNED_BYTE and+//GL_UNSIGNED_SHORT in the glDrawElements call. So use shorts on ES 1.1+//platforms. Since we compile tiles on them and solid colored tiles are+//not counted, this is probably fine.+#ifdef SDL_VIDEO_OPENGL_ES 		typedef GLshort IndexType; #define TILE_INDEX_TYPE GL_UNSIGNED_SHORT-#define TILE_INDEX_TYPE_MAX SHRT_MAX+#define TILE_INDEX_TYPE_MAX USHRT_MAX #else 		typedef GLint IndexType; #define TILE_INDEX_TYPE GL_UNSIGNED_INT-- 1.7.1