Merge pull request #1270 from barfowl/gcc_warnings_conversion

Suppression of more GCC warnings with -Wconversion
This commit is contained in:
David G Yu 2022-09-14 16:14:37 -07:00 committed by GitHub
commit 1cb5494c59
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions

View File

@ -1276,7 +1276,7 @@ PatchTableBuilder::populatePatches() {
patchParam.GetU(), patchParam.GetV(),
patchParam.GetDepth(),
patchParam.NonQuadRoot(),
fvcPatchInfo.paramBoundaryMask,
(unsigned short) fvcPatchInfo.paramBoundaryMask,
patchParam.GetTransition(),
fvcPatchInfo.isRegular);
}

View File

@ -95,7 +95,7 @@ CpuGLVertexBuffer::BindVBO(void * /*deviceContext*/) {
if (! _dataDirty)
return _vbo;
int size = GetNumElements() * GetNumVertices() * sizeof(float);
int size = GetNumElements() * GetNumVertices() * (int) sizeof(float);
if (! _vbo) {
glGenBuffers(1, &_vbo);

View File

@ -59,7 +59,7 @@ void
GLVertexBuffer::UpdateData(const float *src, int startVertex, int numVertices,
void * /*deviceContext*/) {
int size = numVertices * _numElements * sizeof(float);
int size = numVertices * _numElements * (int) sizeof(float);
#if defined(GL_ARB_direct_state_access)
if (OSD_OPENGL_HAS(ARB_direct_state_access)) {
glNamedBufferSubData(_vbo,
@ -96,7 +96,7 @@ GLVertexBuffer::BindVBO(void * /*deviceContext*/) {
bool
GLVertexBuffer::allocate() {
int size = _numElements * _numVertices * sizeof(float);
int size = _numElements * _numVertices * (int) sizeof(float);
#if defined(GL_ARB_direct_state_access)