64-bit compile fixes

This commit is contained in:
baldurk
2014-12-03 14:10:57 +00:00
parent 46a29c7d14
commit 431eef4e6d
4 changed files with 6 additions and 6 deletions
+1 -1
View File
@@ -1032,7 +1032,7 @@ ResourceId GLReplay::RenderOverlay(ResourceId texid, TextureDisplayOverlay overl
char **srcs = new char *[shadDetails.sources.size()];
for(size_t s=0; s < shadDetails.sources.size(); s++)
srcs[s] = (char *)shadDetails.sources[s].c_str();
gl.glShaderSource(shad, shadDetails.sources.size(), srcs, NULL);
gl.glShaderSource(shad, (GLsizei)shadDetails.sources.size(), srcs, NULL);
SAFE_DELETE_ARRAY(srcs);
gl.glCompileShader(shad);
+1 -1
View File
@@ -412,7 +412,7 @@ bool GLResourceManager::Serialise_InitialState(GLResource res)
char **srcs = new char *[shadDetails.sources.size()];
for(size_t s=0; s < shadDetails.sources.size(); s++)
srcs[s] = (char *)shadDetails.sources[s].c_str();
gl.glShaderSource(shad, shadDetails.sources.size(), srcs, NULL);
gl.glShaderSource(shad, (GLsizei)shadDetails.sources.size(), srcs, NULL);
SAFE_DELETE_ARRAY(srcs);
gl.glCompileShader(shad);
@@ -736,7 +736,7 @@ void WrappedOpenGL::glBindBufferRange(GLenum target, GLuint index, GLuint buffer
// use glTransformFeedbackBufferRange to ensure the feedback object is bound when we bind the
// buffer
SCOPED_SERIALISE_CONTEXT(FEEDBACK_BUFFER_RANGE);
Serialise_glTransformFeedbackBufferRange(feedback, index, buffer, offset, size);
Serialise_glTransformFeedbackBufferRange(feedback, index, buffer, offset, (GLsizei)size);
m_FeedbackRecord->AddChunk(scope.Get());
}
@@ -906,7 +906,7 @@ void WrappedOpenGL::glBindBuffersRange(GLenum target, GLuint first, GLsizei coun
// use glTransformFeedbackBufferRange to ensure the feedback object is bound when we bind the
// buffer
SCOPED_SERIALISE_CONTEXT(FEEDBACK_BUFFER_RANGE);
Serialise_glTransformFeedbackBufferRange(feedback, first+i, buffers[i], offsets[i], sizes[i]);
Serialise_glTransformFeedbackBufferRange(feedback, first+i, buffers[i], offsets[i], (GLsizei)sizes[i]);
m_FeedbackRecord->AddChunk(scope.Get());
}
@@ -3216,7 +3216,7 @@ bool WrappedOpenGL::Serialise_glTextureBufferRangeEXT(GLuint texture, GLenum tar
if(m_State == READING)
{
ResourceId liveId = GetResourceManager()->GetLiveID(texid);
m_Textures[liveId].width = uint32_t(Size)/GetByteSize(1, 1, 1, GetBaseFormat(fmt), GetDataType(fmt), 1);
m_Textures[liveId].width = uint32_t(Size)/uint32_t(GetByteSize(1, 1, 1, GetBaseFormat(fmt), GetDataType(fmt), 1));
m_Textures[liveId].height = 1;
m_Textures[liveId].depth = 1;
m_Textures[liveId].curType = TextureTarget(Target);
@@ -3280,7 +3280,7 @@ bool WrappedOpenGL::Serialise_glTextureBufferEXT(GLuint texture, GLenum target,
ResourceId liveId = GetResourceManager()->GetLiveID(texid);
uint32_t Size = 1;
m_Real.glGetNamedBufferParameterivEXT(buffer, eGL_BUFFER_SIZE, (GLint *)&Size);
m_Textures[liveId].width = Size/GetByteSize(1, 1, 1, GetBaseFormat(fmt), GetDataType(fmt), 1);
m_Textures[liveId].width = Size/uint32_t(GetByteSize(1, 1, 1, GetBaseFormat(fmt), GetDataType(fmt), 1));
m_Textures[liveId].height = 1;
m_Textures[liveId].depth = 1;
m_Textures[liveId].curType = TextureTarget(Target);