From 8ce3a4aa7014c378d4121979f3fd10b9886d38bc Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sat, 26 Dec 2015 16:00:23 -0500 Subject: ShaderGeneration: Get rid of static buffers --- Source/Core/VideoCommon/GeometryShaderGen.cpp | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'Source/Core/VideoCommon/GeometryShaderGen.cpp') diff --git a/Source/Core/VideoCommon/GeometryShaderGen.cpp b/Source/Core/VideoCommon/GeometryShaderGen.cpp index bf054464c2..5bb1c4906c 100644 --- a/Source/Core/VideoCommon/GeometryShaderGen.cpp +++ b/Source/Core/VideoCommon/GeometryShaderGen.cpp @@ -7,10 +7,8 @@ #include "VideoCommon/BPMemory.h" #include "VideoCommon/GeometryShaderGen.h" #include "VideoCommon/LightingShaderGen.h" -#include "VideoCommon/VertexShaderGen.h" #include "VideoCommon/VideoConfig.h" -static char text[16384]; static const char* primitives_ogl[] = { @@ -39,12 +37,6 @@ static inline T GenerateGeometryShader(u32 primitive_type, API_TYPE ApiType) if (uid_data == nullptr) uid_data = &dummy_data; - out.SetBuffer(text); - const bool is_writing_shadercode = (out.GetBuffer() != nullptr); - - if (is_writing_shadercode) - text[sizeof(text) - 1] = 0x7C; // canary - uid_data->primitive_type = primitive_type; const unsigned int vertex_in = primitive_type + 1; unsigned int vertex_out = primitive_type == PRIMITIVE_TRIANGLES ? 3 : 4; @@ -288,12 +280,6 @@ static inline T GenerateGeometryShader(u32 primitive_type, API_TYPE ApiType) out.Write("}\n"); - if (is_writing_shadercode) - { - if (text[sizeof(text) - 1] != 0x7C) - PanicAlert("GeometryShader generator - buffer too small, canary has been eaten!"); - } - return out; } -- cgit v1.2.3 From c151fe582f3b9f893650d14239d56eb4d24cbab3 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sat, 26 Dec 2015 17:56:06 -0500 Subject: ShaderGenerators: Remove unnecessary inline keywords Static by itself is sufficient --- Source/Core/VideoCommon/GeometryShaderGen.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'Source/Core/VideoCommon/GeometryShaderGen.cpp') diff --git a/Source/Core/VideoCommon/GeometryShaderGen.cpp b/Source/Core/VideoCommon/GeometryShaderGen.cpp index 5bb1c4906c..9c1ccd3071 100644 --- a/Source/Core/VideoCommon/GeometryShaderGen.cpp +++ b/Source/Core/VideoCommon/GeometryShaderGen.cpp @@ -24,11 +24,11 @@ static const char* primitives_d3d[] = "triangle" }; -template static inline void EmitVertex(T& out, const char* vertex, API_TYPE ApiType, bool first_vertex = false); -template static inline void EndPrimitive(T& out, API_TYPE ApiType); +template static void EmitVertex(T& out, const char* vertex, API_TYPE ApiType, bool first_vertex = false); +template static void EndPrimitive(T& out, API_TYPE ApiType); template -static inline T GenerateGeometryShader(u32 primitive_type, API_TYPE ApiType) +static T GenerateGeometryShader(u32 primitive_type, API_TYPE ApiType) { T out; // Non-uid template parameters will write to the dummy data (=> gets optimized out) @@ -284,7 +284,7 @@ static inline T GenerateGeometryShader(u32 primitive_type, API_TYPE ApiType) } template -static inline void EmitVertex(T& out, const char* vertex, API_TYPE ApiType, bool first_vertex) +static void EmitVertex(T& out, const char* vertex, API_TYPE ApiType, bool first_vertex) { if (g_ActiveConfig.bWireFrame && first_vertex) out.Write("\tif (i == 0) first = %s;\n", vertex); @@ -305,7 +305,7 @@ static inline void EmitVertex(T& out, const char* vertex, API_TYPE ApiType, bool out.Write("\toutput.Append(ps);\n"); } template -static inline void EndPrimitive(T& out, API_TYPE ApiType) +static void EndPrimitive(T& out, API_TYPE ApiType) { if (g_ActiveConfig.bWireFrame) EmitVertex(out, "first", ApiType); -- cgit v1.2.3