Remove some unused, misplaced, or ancient code.

snes9xgit · May 1, 2023 · 7726cc6 · 7726cc6
1 parent b2d92e8
commit 7726cc6
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 21 deletions.
diff --git a/external/glslang b/external/glslang
diff --git a/port.h b/port.h
@@ -111,9 +111,6 @@ typedef size_t				pint;
 #define FALSE	0
 #endif
 
-#define START_EXTERN_C	extern "C" {
-#define END_EXTERN_C	}
-
 #ifndef __WIN32__
 #ifndef PATH_MAX
 #define PATH_MAX        1024
@@ -150,15 +147,6 @@ void SetInfoDlgColor(unsigned char, unsigned char, unsigned char);
 #define SLASH_CHAR	'/'
 #endif
 
-#ifndef SIG_PF
-#define SIG_PF	void (*) (int)
-#endif
-
-#ifdef __linux
-#define TITLE "Snes9x: Linux"
-#define SYS_CONFIG_FILE "/etc/snes9x/snes9x.conf"
-#endif
-
 #ifndef TITLE
 #define TITLE "Snes9x"
 #endif

diff --git a/snes9x.cpp b/snes9x.cpp
@@ -171,11 +171,6 @@ void S9xLoadConfigFiles (char **argv, int argc)
 
 	if (!skip)
 	{
-	#ifdef SYS_CONFIG_FILE
-		try_load_config_file(SYS_CONFIG_FILE, conf);
-		S9xParsePortConfig(conf, 0);
-	#endif
-
 		std::string	fname;
 
 		fname = S9xGetDirectory(DEFAULT_DIR);
@@ -753,4 +748,4 @@ char * S9xParseArgs (char **argv, int argc)
 	S9xVerifyControllers();
 
 	return (rom_filename);
-}
+}
diff --git a/win32/render.cpp b/win32/render.cpp
@@ -76,9 +76,7 @@ uint8 *ChangeLog [3] = {
     ChangeLog1, ChangeLog2, ChangeLog3
 };
 
-START_EXTERN_C
 uint8 snes9x_clear_change_log = 0;
-END_EXTERN_C
 
 enum BlarggMode {
     UNINITIALIZED,
+0 −108		.appveyor.yml
+112 −6		.github/workflows/continuous_deployment.yml
+41 −0		.github/workflows/continuous_integration.yml
+3 −0		.mailmap
+1 −1		BUILD.bazel
+1 −1		BUILD.gn
+9 −0		CHANGES.md
+15 −27		CMakeLists.txt
+3 −3		README.md
+47 −16		SPIRV/GlslangToSpv.cpp
+34 −27		SPIRV/SpvBuilder.cpp
+0 −25		StandAlone/CMakeLists.txt
+25 −1		StandAlone/StandAlone.cpp
+1 −1		Test/baseResults/300layout.vert.out
+2 −2		Test/baseResults/440.frag.out
+35 −0		Test/baseResults/glsl.-P.frag.out
+45 −0		Test/baseResults/glsl.-P.function.frag.out
+49 −0		Test/baseResults/glsl.-P.include.frag.out
+606 −0		Test/baseResults/hlsl.emptystructreturn.tesc.out
+402 −0		Test/baseResults/hlsl.structcopy.comp.out
+385 −0		Test/baseResults/hlsl.structcopylogical.comp.out
+3 −0		Test/baseResults/preprocessor.function_macro.vert.out
+322 −183		Test/baseResults/spv.debugInfo.1.1.frag.out
+323 −184		Test/baseResults/spv.debugInfo.frag.out
+828 −821		Test/baseResults/spv.debuginfo.glsl.frag.out
+46 −0		Test/baseResults/spv.intrinsicsSpirvDecorateId.comp.out
+39 −0		Test/baseResults/spv.intrinsicsSpirvDecorateString.comp.out
+142 −0		Test/baseResults/spv.structCopy.comp.out
+20 −0		Test/glsl.-P.frag
+8 −0		Test/glsl.-P.function.frag
+10 −0		Test/glsl.-P.include.frag
+4 −0		Test/glsl.-P.included.glsl
+48 −0		Test/hlsl.emptystructreturn.tesc
+28 −0		Test/hlsl.structcopy.comp
+28 −0		Test/hlsl.structcopylogical.comp
+3 −0		Test/preprocessor.function_macro.vert
+9 −3		Test/runtests
+31 −0		Test/spv.debugInfo.frag
+2 −0		Test/spv.debuginfo.glsl.frag
+16 −0		Test/spv.intrinsicsSpirvDecorateId.comp
+15 −0		Test/spv.intrinsicsSpirvDecorateString.comp
+37 −0		Test/spv.structCopy.comp
+40 −3		glslang/CMakeLists.txt
+5 −2		glslang/HLSL/hlslParseHelper.cpp
+3 −3		glslang/MachineIndependent/ParseContextBase.cpp
+4 −3		glslang/MachineIndependent/ParseHelper.cpp
+2 −3		glslang/MachineIndependent/ShaderLang.cpp
+23 −24		glslang/MachineIndependent/SpirvIntrinsics.cpp
+23 −13		glslang/MachineIndependent/glslang.m4
+23 −13		glslang/MachineIndependent/glslang.y
+1,837 −1,798		glslang/MachineIndependent/glslang_tab.cpp
+11 −6		glslang/MachineIndependent/preprocessor/Pp.cpp
+19 −4		glslang/MachineIndependent/preprocessor/PpContext.h
+1 −3		glslang/MachineIndependent/preprocessor/PpScanner.cpp
+2 −2		glslang/MachineIndependent/preprocessor/PpTokens.cpp
+3 −15		glslang/OSDependent/Unix/CMakeLists.txt
+0 −0		glslang/ResourceLimits/ResourceLimits.cpp
+0 −0		glslang/ResourceLimits/resource_limits_c.cpp
+4 −1		gtests/Hlsl.FromFile.cpp
+3 −0		gtests/Spv.FromFile.cpp
+2 −2		known_good.json
+6 −0		kokoro/linux-clang-gn/build.sh