mirror of
https://github.com/libretro/parallel-n64.git
synced 2026-11-07 04:25:59 -10:00
glsm: move it out of libretro-common, into libretro/glsm
libretro-common upstream no longer has glsm, and this copy carries the core's own changes, so it is the core's code: it lives with the rest of it now, and libretro-common/ stays a plain sync of upstream. The headers keep their <glsm/...> names, found through the libretro/ include path every build already has; the Makefile, the MSVC 2013 project and the glsm and Glitch64 tests point at the new place.
This commit is contained in:
1 parent
efaf5f5f2f
commit
080fef16de
11 files changed
+7
-6
No files matched your search
@@ -1258,7 +1258,7 @@ lrhost_gl$(EXE_EXT): tools/lrhost.c tools/lrhost_gl.h $(LIBRETRO_COMM_DIR)/featu
|
||||
# write, and its texture uploads for desktop GL and for GLES 2
|
||||
GLITCH64_TEST_SRCS := $(VIDEODIR_GLIDE)/Glitch64/glitchmain.c $(VIDEODIR_GLIDE)/Glitch64/glitch64_combiner.c \
|
||||
$(VIDEODIR_GLIDE)/Glitch64/geometry.c $(VIDEODIR_GLIDE)/Glitch64/glitch64_textures.c \
|
||||
$(LIBRETRO_COMM_DIR)/glsm/glsm.c $(LIBRETRO_COMM_DIR)/gfx/gl_capabilities.c $(LIBRETRO_COMM_DIR)/glsym/rglgen.c
|
||||
$(ROOT_DIR)/libretro/glsm/glsm.c $(LIBRETRO_COMM_DIR)/gfx/gl_capabilities.c $(LIBRETRO_COMM_DIR)/glsym/rglgen.c
|
||||
GLITCH64_TEST_FLAGS := -D__LIBRETRO__ -DINLINE=inline -DM64P_PLUGIN_API -DM64P_CORE_PROTOTYPES -DHAVE_GLIDE64 \
|
||||
-I$(VIDEODIR_GLIDE)/Glitch64/inc -I$(ROOT_DIR)/include -I$(ROOT_DIR)/libretro -I$(LIBRETRO_COMM_DIR)/include \
|
||||
-I$(CORE_DIR)/src -I$(CORE_DIR)/src/api $(filter -fsanitize=% -O% -g,$(CFLAGS)) -w
|
||||
|
||||
+1
-1
@@ -305,7 +305,7 @@ endif
|
||||
# Libretro
|
||||
|
||||
ifeq ($(HAVE_OPENGL),1)
|
||||
SOURCES_C += $(LIBRETRO_COMM_DIR)/glsm/glsm.c \
|
||||
SOURCES_C += $(LIBRETRO_DIR)/glsm/glsm.c \
|
||||
$(LIBRETRO_DIR)/aleck64_e90_gl.c
|
||||
endif
|
||||
|
||||
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -737,7 +737,7 @@
|
||||
<ClCompile Include="..\..\..\libretro-common\conversion\float_to_s16.c" />
|
||||
<ClCompile Include="..\..\..\libretro-common\conversion\s16_to_float.c" />
|
||||
<ClCompile Include="..\..\..\libretro-common\features\features_cpu.c" />
|
||||
<ClCompile Include="..\..\..\libretro-common\glsm\glsm.c" />
|
||||
<ClCompile Include="..\..\glsm\glsm.c" />
|
||||
<ClCompile Include="..\..\..\libretro-common\glsym\glsym_gl.c" />
|
||||
<ClCompile Include="..\..\..\libretro-common\glsym\rglgen.c" />
|
||||
<ClCompile Include="..\..\..\libretro-common\libco\libco.c" />
|
||||
|
||||
@@ -495,7 +495,7 @@
|
||||
<ClCompile Include="..\..\..\libretro-common\libco\libco.c">
|
||||
<Filter>Source Files\libretro\libco</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\libretro-common\glsm\glsm.c">
|
||||
<ClCompile Include="..\..\glsm\glsm.c">
|
||||
<Filter>Source Files\libretro\glsm</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\mupen64plus-core\src\dd\dd_controller.c">
|
||||
|
||||
@@ -35,6 +35,7 @@ def main():
|
||||
"-DHAVE_OPENGLES3", "-DHAVE_THR_AL", "-DHAVE_PARALLEL",
|
||||
f'-DGLSM_FRAME_BOUNDARY_SOURCE="{header}"',
|
||||
"-I" + str(root / "libretro-common/include"),
|
||||
"-I" + str(root / "libretro"),
|
||||
str(root / "tools/test_glsm_gles3.c"),
|
||||
str(root / "libretro-common/glsym/glsym_es3.c"),
|
||||
str(root / "libretro-common/glsym/rglgen.c"),
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
/* cc -std=c99 -DHAVE_OPENGLES -DHAVE_OPENGLES3 -Ilibretro-common/include
|
||||
/* cc -std=c99 -DHAVE_OPENGLES -DHAVE_OPENGLES3 -Ilibretro-common/include -Ilibretro
|
||||
* tools/test_glsm_gles3.c libretro-common/glsym/glsym_es3.c
|
||||
* libretro-common/glsym/rglgen.c -lEGL -lGLESv2 -o test_glsm_gles3
|
||||
* EGL_PLATFORM=surfaceless ./test_glsm_gles3
|
||||
@@ -7,7 +7,7 @@
|
||||
#include <EGL/egl.h>
|
||||
#include <glsym/glsym.h>
|
||||
#ifndef GLSM_SOURCE
|
||||
#define GLSM_SOURCE "../libretro-common/glsm/glsm.c"
|
||||
#define GLSM_SOURCE "../libretro/glsm/glsm.c"
|
||||
#endif
|
||||
#include GLSM_SOURCE
|
||||
|
||||
|
||||
Reference in new issue
Block a user