summaryrefslogtreecommitdiffstatshomepage
path: root/3rdparty/bgfx/src/shader_dx9bc.h
diff options
context:
space:
mode:
author ImJezze <jezze@gmx.net>2016-03-12 12:31:13 +0100
committer ImJezze <jezze@gmx.net>2016-03-12 12:31:13 +0100
commita026a582f1a0ea8c1ede3acaddacef506ef3f3b0 (patch)
treee31573822f2359677de519f9f3b600d98e8764cd /3rdparty/bgfx/src/shader_dx9bc.h
parent477d2abd43984f076b7e45f5527591fa8fd0d241 (diff)
parentdcab55bf53b94713a6f72e9633f5101c8dd6c08c (diff)
Merge pull request #15 from mamedev/master
Sync to base master
Diffstat (limited to '3rdparty/bgfx/src/shader_dx9bc.h')
-rw-r--r--3rdparty/bgfx/src/shader_dx9bc.h18
1 files changed, 9 insertions, 9 deletions
diff --git a/3rdparty/bgfx/src/shader_dx9bc.h b/3rdparty/bgfx/src/shader_dx9bc.h
index d7b6b381dc3..0680d641a12 100644
--- a/3rdparty/bgfx/src/shader_dx9bc.h
+++ b/3rdparty/bgfx/src/shader_dx9bc.h
@@ -226,8 +226,8 @@ namespace bgfx
int32_t value[4];
};
- int32_t read(bx::ReaderI* _reader, Dx9bcInstruction& _instruction);
- int32_t write(bx::WriterI* _writer, const Dx9bcInstruction& _instruction);
+ int32_t read(bx::ReaderI* _reader, Dx9bcInstruction& _instruction, bx::Error* _err);
+ int32_t write(bx::WriterI* _writer, const Dx9bcInstruction& _instruction, bx::Error* _err);
int32_t toString(char* _out, int32_t _size, const Dx9bcInstruction& _instruction);
struct Dx9bcShader
@@ -235,8 +235,8 @@ namespace bgfx
stl::vector<uint8_t> byteCode;
};
- int32_t read(bx::ReaderSeekerI* _reader, Dx9bcShader& _shader);
- int32_t write(bx::WriterI* _writer, const Dx9bcShader& _shader);
+ int32_t read(bx::ReaderSeekerI* _reader, Dx9bcShader& _shader, bx::Error* _err);
+ int32_t write(bx::WriterI* _writer, const Dx9bcShader& _shader, bx::Error* _err);
struct Dx9bc
{
@@ -244,14 +244,14 @@ namespace bgfx
Dx9bcShader shader;
};
- int32_t read(bx::ReaderSeekerI* _reader, Dx9bc& _dx9bc);
- int32_t write(bx::WriterSeekerI* _writer, const Dx9bc& _dx9bc);
+ int32_t read(bx::ReaderSeekerI* _reader, Dx9bc& _dx9bc, bx::Error* _err);
+ int32_t write(bx::WriterSeekerI* _writer, const Dx9bc& _dx9bc, bx::Error* _err);
- typedef void (*Dx9bcParseFn)(uint32_t _offset, const Dx9bcInstruction& _instruction, void* _userData);
- void parse(const Dx9bcShader& _src, Dx9bcParseFn _fn, void* _userData);
+ typedef bool (*Dx9bcParseFn)(uint32_t _offset, const Dx9bcInstruction& _instruction, void* _userData);
+ void parse(const Dx9bcShader& _src, Dx9bcParseFn _fn, void* _userData, bx::Error* _err = NULL);
typedef void (*Dx9bcFilterFn)(Dx9bcInstruction& _instruction, void* _userData);
- void filter(Dx9bcShader& _dst, const Dx9bcShader& _src, Dx9bcFilterFn _fn, void* _userData);
+ void filter(Dx9bcShader& _dst, const Dx9bcShader& _src, Dx9bcFilterFn _fn, void* _userData, bx::Error* _err = NULL);
} // namespace bgfx