From e3c89e577fa66723d0fc6666bb06dfcddec7e1fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Branimir=20Karad=C5=BEi=C4=87?= Date: Thu, 10 Mar 2016 21:11:08 -0800 Subject: [PATCH] Cleanup. --- src/shader_spirv.cpp | 2 +- src/shader_spirv.h | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/shader_spirv.cpp b/src/shader_spirv.cpp index 2fec1c0b0..ed53f417f 100644 --- a/src/shader_spirv.cpp +++ b/src/shader_spirv.cpp @@ -961,7 +961,7 @@ namespace bgfx return size; } - void parse(const SpvShader& _src, SpirvParseFn _fn, void* _userData, bx::Error* _err) + void parse(const SpvShader& _src, SpvParseFn _fn, void* _userData, bx::Error* _err) { BX_ERROR_SCOPE(_err); diff --git a/src/shader_spirv.h b/src/shader_spirv.h index a21bbf93f..0831dbbf8 100644 --- a/src/shader_spirv.h +++ b/src/shader_spirv.h @@ -345,7 +345,7 @@ namespace bgfx }; }; - struct SpirvBuiltin + struct SpvBuiltin { enum Enum { @@ -605,11 +605,11 @@ namespace bgfx int32_t read(bx::ReaderSeekerI* _reader, SpvShader& _shader, bx::Error* _err); int32_t write(bx::WriterI* _writer, const SpvShader& _shader, bx::Error* _err); - typedef bool (*SpirvParseFn)(uint32_t _offset, const SpvInstruction& _instruction, void* _userData); - void parse(const SpvShader& _src, SpirvParseFn _fn, void* _userData, bx::Error* _err = NULL); + typedef bool (*SpvParseFn)(uint32_t _offset, const SpvInstruction& _instruction, void* _userData); + void parse(const SpvShader& _src, SpvParseFn _fn, void* _userData, bx::Error* _err = NULL); - typedef void (*SpirvFilterFn)(SpvInstruction& _instruction, void* _userData); - void filter(SpvShader& _dst, const SpvShader& _src, SpirvFilterFn _fn, void* _userData, bx::Error* _err = NULL); + typedef void (*SpvFilterFn)(SpvInstruction& _instruction, void* _userData); + void filter(SpvShader& _dst, const SpvShader& _src, SpvFilterFn _fn, void* _userData, bx::Error* _err = NULL); struct SpirV {