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

commit makefile changes

Browse Source
This commit is contained in:
ToadKing 2013-02-28 10:20:29 -05:00
parent d28cb94717
commit 83878b05e7
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android/native/jni/Android.mk
View File

@ -51,7 +51,7 @@ ifeq ($(PERF_TEST), 1)
LOCAL_CFLAGS += -DPERF_TEST LOCAL_CFLAGS += -DPERF_TEST
endif endif
LOCAL_CFLAGS += -Wall -pthread -Wno-unused-function -O3 -fno-stack-protector -funroll-loops -DNDEBUG -DHAVE_GRIFFIN -DANDROID -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_FBO -DHAVE_OVERLAY -DHAVE_OPENGLES -DHAVE_VID_CONTEXT -DHAVE_OPENGLES2 -DGLSL_DEBUG -DHAVE_GLSL -DWANT_MINIZ -DHAVE_ZLIB -DINLINE=inline -DLSB_FIRST -DHAVE_THREADS -D__LIBRETRO__ -DRARCH_PERFORMANCE_MODE -DPACKAGE_VERSION=\"$(RARCH_VERSION)\" -std=gnu99 -I../../../deps/miniz LOCAL_CFLAGS += -Wall -pthread -Wno-unused-function -O3 -fno-stack-protector -funroll-loops -DNDEBUG -DHAVE_GRIFFIN -DANDROID -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_FBO -DHAVE_OVERLAY -DHAVE_OPENGLES -DHAVE_VID_CONTEXT -DHAVE_OPENGLES2 -DGLSL_DEBUG -DHAVE_GLSL -DHAVE_RMENU -DHAVE_RGUI -DHAVE_SCREENSHOTS -DWANT_MINIZ -DHAVE_ZLIB -DINLINE=inline -DLSB_FIRST -DHAVE_THREADS -D__LIBRETRO__ -DRARCH_PERFORMANCE_MODE -DPACKAGE_VERSION=\"$(RARCH_VERSION)\" -std=gnu99 -I../../../deps/miniz
LOCAL_LDLIBS := -L$(SYSROOT)/usr/lib -landroid -lEGL -lGLESv2 $(LOGGER_LDLIBS) -ldl LOCAL_LDLIBS := -L$(SYSROOT)/usr/lib -landroid -lEGL -lGLESv2 $(LOGGER_LDLIBS) -ldl

11
gfx/gl.c
View File

@ -1257,13 +1257,14 @@ static void gl_pbo_async_readback(void *data)
static inline void gl_draw_rgui(void *data) static inline void gl_draw_rgui(void *data)
{ {
static const GLfloat white_color_rgui[16] = { static const GLfloat white_color_rgui[16] = {
1.0f, 1.0f, 1.0f, 0.25f, 1.0f, 1.0f, 1.0f, 0.5f,
1.0f, 1.0f, 1.0f, 0.25f, 1.0f, 1.0f, 1.0f, 0.5f,
1.0f, 1.0f, 1.0f, 0.25f, 1.0f, 1.0f, 1.0f, 0.5f,
1.0f, 1.0f, 1.0f, 0.25f, 1.0f, 1.0f, 1.0f, 0.5f,
}; };
gl_t *gl = (gl_t*)data; gl_t *gl = (gl_t*)data;
gl->coords.color = white_color_rgui;
glBindTexture(GL_TEXTURE_2D, gl->rgui_texture); glBindTexture(GL_TEXTURE_2D, gl->rgui_texture);
@ -1274,9 +1275,9 @@ static inline void gl_draw_rgui(void *data)
GL_UNSIGNED_SHORT_5_6_5, gl->menu_data); GL_UNSIGNED_SHORT_5_6_5, gl->menu_data);
gl_shader_use_func(gl, 0); gl_shader_use_func(gl, 0);
gl_shader_set_coords_func(gl, &gl->coords, &gl->mvp_no_rot);
glEnable(GL_BLEND); glEnable(GL_BLEND);
gl->coords.color = white_color_rgui;
glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
glDisable(GL_BLEND); glDisable(GL_BLEND);