From b6728ce23e9d83e950f658bcc61a67e3c9089e2b Mon Sep 17 00:00:00 2001 From: Ben Vanik Date: Wed, 3 Jun 2015 22:34:58 -0700 Subject: [PATCH] Removing additional varargs trampoline in shader translator. --- src/xenia/base/string_buffer.h | 1 - src/xenia/gpu/gl4/gl4_shader_translator.cc | 2 ++ src/xenia/gpu/gl4/gl4_shader_translator.h | 6 ------ 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/xenia/base/string_buffer.h b/src/xenia/base/string_buffer.h index f54501299..a974daf79 100644 --- a/src/xenia/base/string_buffer.h +++ b/src/xenia/base/string_buffer.h @@ -35,7 +35,6 @@ class StringBuffer { const char* GetString() const; std::string to_string(); char* ToString(); - char* EncodeBase64(); private: void Grow(size_t additional_length); diff --git a/src/xenia/gpu/gl4/gl4_shader_translator.cc b/src/xenia/gpu/gl4/gl4_shader_translator.cc index 715907349..91ee56766 100644 --- a/src/xenia/gpu/gl4/gl4_shader_translator.cc +++ b/src/xenia/gpu/gl4/gl4_shader_translator.cc @@ -21,6 +21,8 @@ namespace gl4 { using namespace xe::gpu::ucode; using namespace xe::gpu::xenos; +#define Append(...) output_.AppendFormat(__VA_ARGS__) + static const char chan_names[] = { 'x', 'y', 'z', 'w', // these only apply to FETCH dst's, and we shouldn't be using them: diff --git a/src/xenia/gpu/gl4/gl4_shader_translator.h b/src/xenia/gpu/gl4/gl4_shader_translator.h index 17afb68ca..17eedd148 100644 --- a/src/xenia/gpu/gl4/gl4_shader_translator.h +++ b/src/xenia/gpu/gl4/gl4_shader_translator.h @@ -47,12 +47,6 @@ class GL4ShaderTranslator { bool is_pixel_shader() const { return shader_type_ == ShaderType::kPixel; } void Reset(GL4Shader* shader); - void Append(const char* format, ...) { - va_list args; - va_start(args, format); - output_.AppendVarargs(format, args); - va_end(args); - } void AppendSrcReg(const ucode::instr_alu_t& op, int i); void AppendSrcReg(const ucode::instr_alu_t& op, uint32_t num, uint32_t type,