mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-07-03 22:44:32 +00:00
Code Issues Releases Wiki Activity

Change some stuff for butt-endian architectures

Browse source
This commit is contained in:
Valentin Ochs 2017-01-14 20:10:42 +01:00
parent 2374c1a86b
commit beb2216265
3 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Aquaria/UserSettings.cpp
View file

@ -506,8 +506,12 @@ void UserSettings::load(bool doApply, const std::string &overrideFile)
XMLElement *xml_data = doc.FirstChildElement("Data"); XMLElement *xml_data = doc.FirstChildElement("Data");
if (xml_data) if (xml_data)
{ {
xml_data->QueryUnsignedAttribute("savePage", (unsigned int *)&data.savePage); // use a temporary variable so we don't get into trouble on big-endian architectures
xml_data->QueryUnsignedAttribute("saveSlot", (unsigned int *)&data.saveSlot); unsigned int tmp;
xml_data->QueryUnsignedAttribute("savePage", &tmp);
data.savePage = tmp;
xml_data->QueryUnsignedAttribute("saveSlot", &tmp);
data.saveSlot = tmp;
if(const char *patchlist = xml_data->Attribute("activePatches")) if(const char *patchlist = xml_data->Attribute("activePatches"))
{ {

6
BBGE/Shader.cpp
View file

@ -370,7 +370,7 @@ void Shader::_queryUniforms()
{ {
glGetObjectParameterivARB(g_programObj, GL_OBJECT_ACTIVE_UNIFORMS_ARB , (GLint*)&numUniforms); glGetObjectParameterivARB(g_programObj, GL_OBJECT_ACTIVE_UNIFORMS_ARB , (GLint*)&numUniforms);
if (numUniforms <= 0) if (numUniforms == 0 || numUniforms == -1)
{ {
uniforms.clear(); uniforms.clear();
return; return;
@ -426,7 +426,7 @@ int Shader::_getUniformIndex(const char *name)
void Shader::setInt(const char *name, int x, int y /* = 0 */, int z /* = 0 */, int w /* = 0 */) void Shader::setInt(const char *name, int x, int y /* = 0 */, int z /* = 0 */, int w /* = 0 */)
{ {
#if BBGE_BUILD_SHADERS #if BBGE_BUILD_SHADERS
if(!g_programObj || numUniforms <= 0) if(!g_programObj || numUniforms == 0 || numUniforms == -1)
return; return;
int idx = _getUniformIndex(name); int idx = _getUniformIndex(name);
if(unsigned(idx) >= uniforms.size()) if(unsigned(idx) >= uniforms.size())
@ -444,7 +444,7 @@ void Shader::setInt(const char *name, int x, int y /* = 0 */, int z /* = 0 */, i
void Shader::setFloat(const char *name, float x, float y /* = 0 */, float z /* = 0 */, float w /* = 0 */) void Shader::setFloat(const char *name, float x, float y /* = 0 */, float z /* = 0 */, float w /* = 0 */)
{ {
#if BBGE_BUILD_SHADERS #if BBGE_BUILD_SHADERS
if(!g_programObj || numUniforms <= 0) if(!g_programObj || numUniforms == 0 || numUniforms == -1)
return; return;
int idx = _getUniformIndex(name); int idx = _getUniformIndex(name);
if(unsigned(idx) >= uniforms.size()) if(unsigned(idx) >= uniforms.size())

2
BBGE/Shader.h
View file

@ -46,7 +46,7 @@ protected:
std::string vertFile, fragFile; std::string vertFile, fragFile;
std::string vertSrc, fragSrc; std::string vertSrc, fragSrc;
GLuint g_programObj; GLuint g_programObj;
size_t numUniforms; unsigned int numUniforms;
private: private:
static void staticInit(); static void staticInit();