mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-24 13:43:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add configurable multisampling.

Browse Source
This commit is contained in:
Themaister 2013-07-05 22:57:09 +02:00
parent 0b6f92e433
commit 7f9d61533d
1 changed files with 67 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
libretro-test-gl/libretro-test.c
View File

@ -27,7 +27,9 @@ static GLuint prog;
static GLuint vbo; static GLuint vbo;
#ifdef CORE #ifdef CORE
static bool context_alive;
static bool multisample_fbo; static bool multisample_fbo;
static unsigned multisample;
static GLuint vao; static GLuint vao;
static GLuint fbo; static GLuint fbo;
@ -107,24 +109,37 @@ static void compile_program(void)
glDeleteShader(frag); glDeleteShader(frag);
} }
static void setup_vao(void)
{
#ifdef CORE #ifdef CORE
glGenVertexArrays(1, &vao); static void init_multisample(unsigned samples)
{
multisample = samples;
if (!context_alive)
return;
if (rbo_color)
glDeleteRenderbuffers(1, &rbo_color);
if (rbo_depth_stencil)
glDeleteRenderbuffers(1, &rbo_depth_stencil);
if (fbo)
glDeleteFramebuffers(1, &fbo);
rbo_color = rbo_depth_stencil = fbo = 0;
multisample_fbo = false;
if (samples <= 1)
return;
if (glRenderbufferStorageMultisample)
{
glGenRenderbuffers(1, &rbo_color); glGenRenderbuffers(1, &rbo_color);
glGenRenderbuffers(1, &rbo_depth_stencil); glGenRenderbuffers(1, &rbo_depth_stencil);
glGenFramebuffers(1, &fbo); glGenFramebuffers(1, &fbo);
multisample_fbo = false;
if (glRenderbufferStorageMultisample)
{
glBindRenderbuffer(GL_RENDERBUFFER, rbo_color); glBindRenderbuffer(GL_RENDERBUFFER, rbo_color);
glRenderbufferStorageMultisample(GL_RENDERBUFFER, glRenderbufferStorageMultisample(GL_RENDERBUFFER,
4, GL_RGBA, MAX_WIDTH, MAX_HEIGHT); samples, GL_RGBA, MAX_WIDTH, MAX_HEIGHT);
glBindRenderbuffer(GL_RENDERBUFFER, rbo_depth_stencil); glBindRenderbuffer(GL_RENDERBUFFER, rbo_depth_stencil);
glRenderbufferStorageMultisample(GL_RENDERBUFFER, glRenderbufferStorageMultisample(GL_RENDERBUFFER,
4, GL_DEPTH24_STENCIL8, MAX_WIDTH, MAX_HEIGHT); samples, GL_DEPTH24_STENCIL8, MAX_WIDTH, MAX_HEIGHT);
glBindRenderbuffer(GL_RENDERBUFFER, 0); glBindRenderbuffer(GL_RENDERBUFFER, 0);
glGenFramebuffers(1, &fbo); glGenFramebuffers(1, &fbo);
@ -146,6 +161,15 @@ static void setup_vao(void)
glBindFramebuffer(GL_FRAMEBUFFER, 0); glBindFramebuffer(GL_FRAMEBUFFER, 0);
} }
else
fprintf(stderr, "Multisampled FBOs not supported.\n");
}
#endif
static void setup_vao(void)
{
#ifdef CORE
glGenVertexArrays(1, &vao);
#endif #endif
glUseProgram(prog); glUseProgram(prog);
@ -220,6 +244,9 @@ void retro_set_environment(retro_environment_t cb)
"Internal resolution; 320x240|360x480|480x272|512x384|512x512|640x240|640x448|640x480|720x576|800x600|960x720|1024x768|1024x1024|1280x720|1280x960|1600x1200|1920x1080|1920x1440|1920x1600", "Internal resolution; 320x240|360x480|480x272|512x384|512x512|640x240|640x448|640x480|720x576|800x600|960x720|1024x768|1024x1024|1280x720|1280x960|1600x1200|1920x1080|1920x1440|1920x1600",
#endif #endif
}, },
#ifdef CORE
{ "testgl_multisample", "Multisampling; 1x|2x|4x" },
#endif
{ NULL, NULL }, { NULL, NULL },
}; };
@ -255,10 +282,9 @@ void retro_set_video_refresh(retro_video_refresh_t cb)
static void update_variables(void) static void update_variables(void)
{ {
struct retro_variable var; struct retro_variable var = {
.key = "testgl_resolution",
var.key = "testgl_resolution"; };
var.value = NULL;
if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
{ {
@ -275,6 +301,29 @@ static void update_variables(void)
fprintf(stderr, "[libretro-test]: Got size: %u x %u.\n", width, height); fprintf(stderr, "[libretro-test]: Got size: %u x %u.\n", width, height);
} }
#ifdef CORE
var.key = "testgl_multisample";
var.value = NULL;
if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
{
switch (*var.value)
{
case '1':
init_multisample(1);
break;
case '2':
init_multisample(2);
break;
case '4':
init_multisample(4);
break;
}
}
#endif
} }
void retro_run(void) void retro_run(void)
@ -365,6 +414,10 @@ static void context_reset(void)
rglgen_resolve_symbols(hw_render.get_proc_address); rglgen_resolve_symbols(hw_render.get_proc_address);
compile_program(); compile_program();
setup_vao(); setup_vao();
#ifdef CORE
context_alive = true;
init_multisample(multisample);
#endif
} }
static void context_destroy(void) static void context_destroy(void)
@ -374,14 +427,11 @@ static void context_destroy(void)
#ifdef CORE #ifdef CORE
glDeleteVertexArrays(1, &vao); glDeleteVertexArrays(1, &vao);
vao = 0; vao = 0;
glDeleteRenderbuffers(1, &rbo_color); init_multisample(0);
glDeleteRenderbuffers(1, &rbo_depth_stencil); context_alive = false;
glDeleteFramebuffers(1, &fbo);
rbo_color = rbo_depth_stencil = fbo = 0;
#endif #endif
glDeleteBuffers(1, &vbo); glDeleteBuffers(1, &vbo);
vbo = 0; vbo = 0;
glDeleteProgram(prog); glDeleteProgram(prog);
prog = 0; prog = 0;
} }