1. Martín Lucas Golini
  2. SOIL2

Commits

Martín Lucas Golini  committed 6f90200

Added NPOT textures support for GLES devices.

  • Participants
  • Parent commits c36394d
  • Branches default

Comments (0)

Files changed (1)

File src/SOIL2/SOIL2.c

View file
 	#include <GL/gl.h>
 	
 	#ifndef GL_UNSIGNED_SHORT_4_4_4_4
-	#define GL_UNSIGNED_SHORT_4_4_4_4 0x8033
-	#endif
-	#ifndef GL_UNSIGNED_SHORT_5_5_5_1
+	#define GL_UNSIGNED_SHORT_4_4_4_4 0x8033
+	#endif
+	#ifndef GL_UNSIGNED_SHORT_5_5_5_1
 	#define GL_UNSIGNED_SHORT_5_5_5_1 0x8034
 	#endif
 	#ifndef GL_UNSIGNED_SHORT_5_6_5
 		if( NULL != glGetString( GL_EXTENSIONS ) &&
 			(NULL == strstr( (char const*)glGetString( GL_EXTENSIONS ),
 				"GL_ARB_texture_non_power_of_two" ) )
+		&&
+			(NULL == strstr( (char const*)glGetString( GL_EXTENSIONS ),
+				"GL_OES_texture_npot" ) )
 			)
 		{
 			/*	not there, flag the failure	*/