Adds gl_profile_mask to test framework, uses it in testgles

This commit is contained in:
Gabriel Jacobo 2013-10-10 00:49:57 -03:00
parent d0fddfab84
commit 89131435f8
3 changed files with 5 additions and 2 deletions

View File

@ -108,6 +108,7 @@ typedef struct
int gl_major_version; int gl_major_version;
int gl_minor_version; int gl_minor_version;
int gl_debug; int gl_debug;
int gl_profile_mask;
} SDLTest_CommonState; } SDLTest_CommonState;
#include "begin_code.h" #include "begin_code.h"

View File

@ -695,6 +695,9 @@ SDLTest_CommonInit(SDLTest_CommonState * state)
if (state->gl_debug) { if (state->gl_debug) {
SDL_GL_SetAttribute(SDL_GL_CONTEXT_FLAGS, SDL_GL_CONTEXT_DEBUG_FLAG); SDL_GL_SetAttribute(SDL_GL_CONTEXT_FLAGS, SDL_GL_CONTEXT_DEBUG_FLAG);
} }
if (state->gl_profile_mask) {
SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, state->gl_profile_mask);
}
if (state->verbose & VERBOSE_MODES) { if (state->verbose & VERBOSE_MODES) {
SDL_Rect bounds; SDL_Rect bounds;

View File

@ -161,6 +161,7 @@ main(int argc, char *argv[])
state->gl_depth_size = depth; state->gl_depth_size = depth;
state->gl_major_version = 1; state->gl_major_version = 1;
state->gl_minor_version = 1; state->gl_minor_version = 1;
state->gl_profile_mask = SDL_GL_CONTEXT_PROFILE_ES;
if (fsaa) { if (fsaa) {
state->gl_multisamplebuffers=1; state->gl_multisamplebuffers=1;
state->gl_multisamplesamples=fsaa; state->gl_multisamplesamples=fsaa;
@ -179,8 +180,6 @@ main(int argc, char *argv[])
} }
/* Create OpenGL ES contexts */ /* Create OpenGL ES contexts */
SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_ES);
for (i = 0; i < state->num_windows; i++) { for (i = 0; i < state->num_windows; i++) {
context[i] = SDL_GL_CreateContext(state->windows[i]); context[i] = SDL_GL_CreateContext(state->windows[i]);
if (!context[i]) { if (!context[i]) {