From 431eef4e6db817d4faca02c5d3663f0da9dfff25 Mon Sep 17 00:00:00 2001 From: baldurk Date: Wed, 3 Dec 2014 14:10:57 +0000 Subject: [PATCH] 64-bit compile fixes --- renderdoc/driver/gl/gl_debug.cpp | 2 +- renderdoc/driver/gl/gl_manager.cpp | 2 +- renderdoc/driver/gl/wrappers/gl_buffer_funcs.cpp | 4 ++-- renderdoc/driver/gl/wrappers/gl_texture_funcs.cpp | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/renderdoc/driver/gl/gl_debug.cpp b/renderdoc/driver/gl/gl_debug.cpp index 19fc01da2..38f900b5d 100644 --- a/renderdoc/driver/gl/gl_debug.cpp +++ b/renderdoc/driver/gl/gl_debug.cpp @@ -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); diff --git a/renderdoc/driver/gl/gl_manager.cpp b/renderdoc/driver/gl/gl_manager.cpp index 0d5a03348..c2e5cec71 100644 --- a/renderdoc/driver/gl/gl_manager.cpp +++ b/renderdoc/driver/gl/gl_manager.cpp @@ -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); diff --git a/renderdoc/driver/gl/wrappers/gl_buffer_funcs.cpp b/renderdoc/driver/gl/wrappers/gl_buffer_funcs.cpp index aa62cfeec..e93202031 100644 --- a/renderdoc/driver/gl/wrappers/gl_buffer_funcs.cpp +++ b/renderdoc/driver/gl/wrappers/gl_buffer_funcs.cpp @@ -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()); } diff --git a/renderdoc/driver/gl/wrappers/gl_texture_funcs.cpp b/renderdoc/driver/gl/wrappers/gl_texture_funcs.cpp index df7214930..ffc1cbf42 100644 --- a/renderdoc/driver/gl/wrappers/gl_texture_funcs.cpp +++ b/renderdoc/driver/gl/wrappers/gl_texture_funcs.cpp @@ -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);