Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-07 20:06:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing warnings too

Browse source
This commit is contained in:
samcake 2017-05-02 14:45:41 -07:00
parent 32d675c82b
commit 41f0b1682e
2 changed files with 27 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
libraries/gpu-gl/src/gpu/gl41/GL41BackendTexture.cpp
View file

@ -309,7 +309,7 @@ void GL41VariableAllocationTexture::syncSampler() const {
} }
void copyUncompressedTexGPUMem(const gpu::Texture& texture, GLenum texTarget, GLuint srcId, GLuint destId, uint16_t numMips, uint16_t srcAllocatedMip, uint16_t destAllocatedMip, uint16_t populatedMips) { void copyUncompressedTexGPUMem(const gpu::Texture& texture, GLenum texTarget, GLuint srcId, GLuint destId, uint16_t numMips, uint16_t srcMipOffset, uint16_t destMipOffset, uint16_t populatedMips) {
// DestID must be bound to the GL41Backend::RESOURCE_TRANSFER_TEX_UNIT // DestID must be bound to the GL41Backend::RESOURCE_TRANSFER_TEX_UNIT
GLuint fbo { 0 }; GLuint fbo { 0 };
@ -320,8 +320,8 @@ void copyUncompressedTexGPUMem(const gpu::Texture& texture, GLenum texTarget, GL
// copy pre-existing mips // copy pre-existing mips
for (uint16_t mip = populatedMips; mip < mips; ++mip) { for (uint16_t mip = populatedMips; mip < mips; ++mip) {
auto mipDimensions = texture.evalMipDimensions(mip); auto mipDimensions = texture.evalMipDimensions(mip);
uint16_t targetMip = mip - destAllocatedMip; uint16_t targetMip = mip - destMipOffset;
uint16_t sourceMip = mip - srcAllocatedMip; uint16_t sourceMip = mip - srcMipOffset;
for (GLenum target : GLTexture::getFaceTargets(texTarget)) { for (GLenum target : GLTexture::getFaceTargets(texTarget)) {
glFramebufferTexture2D(GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, target, srcId, sourceMip); glFramebufferTexture2D(GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, target, srcId, sourceMip);
(void)CHECK_GL_ERROR(); (void)CHECK_GL_ERROR();
@ -335,7 +335,7 @@ void copyUncompressedTexGPUMem(const gpu::Texture& texture, GLenum texTarget, GL
glDeleteFramebuffers(1, &fbo); glDeleteFramebuffers(1, &fbo);
} }
void copyCompressedTexGPUMem(const gpu::Texture& texture, GLenum texTarget, GLuint srcId, GLuint destId, uint16_t numMips, uint16_t srcAllocatedMip, uint16_t destAllocatedMip, uint16_t populatedMips) { void copyCompressedTexGPUMem(const gpu::Texture& texture, GLenum texTarget, GLuint srcId, GLuint destId, uint16_t numMips, uint16_t srcMipOffset, uint16_t destMipOffset, uint16_t populatedMips) {
// DestID must be bound to the GL41Backend::RESOURCE_TRANSFER_TEX_UNIT // DestID must be bound to the GL41Backend::RESOURCE_TRANSFER_TEX_UNIT
struct MipDesc { struct MipDesc {
@ -359,7 +359,7 @@ void copyCompressedTexGPUMem(const gpu::Texture& texture, GLenum texTarget, GLui
for (uint16_t mip = populatedMips; mip < numMips; ++mip) { for (uint16_t mip = populatedMips; mip < numMips; ++mip) {
auto& sourceMip = sourceMips[mip]; auto& sourceMip = sourceMips[mip];
uint16_t sourceLevel = mip - srcAllocatedMip; uint16_t sourceLevel = mip - srcMipOffset;
// Grab internal format once // Grab internal format once
if (internalFormat == 0) { if (internalFormat == 0) {
@ -383,7 +383,6 @@ void copyCompressedTexGPUMem(const gpu::Texture& texture, GLenum texTarget, GLui
(void)CHECK_GL_ERROR(); (void)CHECK_GL_ERROR();
// Allocate the PBO to accomodate for all the mips to copy // Allocate the PBO to accomodate for all the mips to copy
GLint pboPointer = 0;
GLuint pbo { 0 }; GLuint pbo { 0 };
glGenBuffers(1, &pbo); glGenBuffers(1, &pbo);
glBindBuffer(GL_PIXEL_PACK_BUFFER, pbo); glBindBuffer(GL_PIXEL_PACK_BUFFER, pbo);
@ -394,10 +393,10 @@ void copyCompressedTexGPUMem(const gpu::Texture& texture, GLenum texTarget, GLui
for (uint16_t mip = populatedMips; mip < numMips; ++mip) { for (uint16_t mip = populatedMips; mip < numMips; ++mip) {
auto& sourceMip = sourceMips[mip]; auto& sourceMip = sourceMips[mip];
uint16_t sourceLevel = mip - srcAllocatedMip; uint16_t sourceLevel = mip - srcMipOffset;
for (GLint f = 0; f < faceTargets.size(); f++) { for (GLuint f = 0; f < faceTargets.size(); f++) {
glGetCompressedTexImage(faceTargets[f], sourceLevel, (void*) (pboPointer + (sourceMip._offset + f * sourceMip._faceSize))); glGetCompressedTexImage(faceTargets[f], sourceLevel, (void*) (sourceMip._offset + f * sourceMip._faceSize));
} }
(void)CHECK_GL_ERROR(); (void)CHECK_GL_ERROR();
} }
@ -413,9 +412,9 @@ void copyCompressedTexGPUMem(const gpu::Texture& texture, GLenum texTarget, GLui
for (uint16_t mip = populatedMips; mip < numMips; ++mip) { for (uint16_t mip = populatedMips; mip < numMips; ++mip) {
auto& sourceMip = sourceMips[mip]; auto& sourceMip = sourceMips[mip];
uint16_t destLevel = mip - destAllocatedMip; uint16_t destLevel = mip - destMipOffset;
for (GLint f = 0; f < faceTargets.size(); f++) { for (GLuint f = 0; f < faceTargets.size(); f++) {
#ifdef DEBUG_COPY #ifdef DEBUG_COPY
GLint destWidth, destHeight, destSize; GLint destWidth, destHeight, destSize;
glGetTexLevelParameteriv(faceTargets.front(), destLevel, GL_TEXTURE_WIDTH, &destWidth); glGetTexLevelParameteriv(faceTargets.front(), destLevel, GL_TEXTURE_WIDTH, &destWidth);
@ -423,7 +422,7 @@ void copyCompressedTexGPUMem(const gpu::Texture& texture, GLenum texTarget, GLui
glGetTexLevelParameteriv(faceTargets.front(), destLevel, GL_TEXTURE_COMPRESSED_IMAGE_SIZE, &destSize); glGetTexLevelParameteriv(faceTargets.front(), destLevel, GL_TEXTURE_COMPRESSED_IMAGE_SIZE, &destSize);
#endif #endif
glCompressedTexSubImage2D(faceTargets[f], destLevel, 0, 0, sourceMip._width, sourceMip._height, internalFormat, glCompressedTexSubImage2D(faceTargets[f], destLevel, 0, 0, sourceMip._width, sourceMip._height, internalFormat,
sourceMip._faceSize, (void*)(pboPointer + (sourceMip._offset + f * sourceMip._faceSize))); sourceMip._faceSize, (void*)(sourceMip._offset + f * sourceMip._faceSize));
gpu::gl::checkGLError(); gpu::gl::checkGLError();
} }
} }
@ -451,17 +450,14 @@ void GL41VariableAllocationTexture::promote() {
// copy pre-existing mips // copy pre-existing mips
uint16_t numMips = _gpuObject.getNumMips(); uint16_t numMips = _gpuObject.getNumMips();
if (_texelFormat.isCompressed()) { withPreservedTexture([&] {
withPreservedTexture([&] { if (_texelFormat.isCompressed()) {
copyCompressedTexGPUMem(_gpuObject, _target, oldId, _id, numMips, oldAllocatedMip, _allocatedMip, _populatedMip); copyCompressedTexGPUMem(_gpuObject, _target, oldId, _id, numMips, oldAllocatedMip, _allocatedMip, _populatedMip);
syncSampler(); } else {
});
} else {
withPreservedTexture([&] {
copyUncompressedTexGPUMem(_gpuObject, _target, oldId, _id, numMips, oldAllocatedMip, _allocatedMip, _populatedMip); copyUncompressedTexGPUMem(_gpuObject, _target, oldId, _id, numMips, oldAllocatedMip, _allocatedMip, _populatedMip);
syncSampler(); }
}); syncSampler();
} });
// destroy the old texture // destroy the old texture
glDeleteTextures(1, &oldId); glDeleteTextures(1, &oldId);
@ -484,17 +480,15 @@ void GL41VariableAllocationTexture::demote() {
// copy pre-existing mips // copy pre-existing mips
uint16_t numMips = _gpuObject.getNumMips(); uint16_t numMips = _gpuObject.getNumMips();
if (_texelFormat.isCompressed()) { withPreservedTexture([&] {
withPreservedTexture([&] { if (_texelFormat.isCompressed()) {
copyCompressedTexGPUMem(_gpuObject, _target, oldId, _id, numMips, oldAllocatedMip, _allocatedMip, _populatedMip); copyCompressedTexGPUMem(_gpuObject, _target, oldId, _id, numMips, oldAllocatedMip, _allocatedMip, _populatedMip);
syncSampler(); } else {
});
} else {
withPreservedTexture([&] {
copyUncompressedTexGPUMem(_gpuObject, _target, oldId, _id, numMips, oldAllocatedMip, _allocatedMip, _populatedMip); copyUncompressedTexGPUMem(_gpuObject, _target, oldId, _id, numMips, oldAllocatedMip, _allocatedMip, _populatedMip);
syncSampler(); }
}); syncSampler();
} });
// destroy the old texture // destroy the old texture
glDeleteTextures(1, &oldId); glDeleteTextures(1, &oldId);

6
libraries/gpu-gl/src/gpu/gl45/GL45BackendVariableTexture.cpp
View file

@ -98,11 +98,11 @@ void GL45ResourceTexture::syncSampler() const {
} }
void copyTexGPUMem(const gpu::Texture& texture, GLenum texTarget, GLuint srcId, GLuint destId, uint16_t numMips, uint16_t srcAllocatedMip, uint16_t destAllocatedMip, uint16_t populatedMips) { void copyTexGPUMem(const gpu::Texture& texture, GLenum texTarget, GLuint srcId, GLuint destId, uint16_t numMips, uint16_t srcMipOffset, uint16_t destMipOffset, uint16_t populatedMips) {
for (uint16_t mip = populatedMips; mip < numMips; ++mip) { for (uint16_t mip = populatedMips; mip < numMips; ++mip) {
auto mipDimensions = texture.evalMipDimensions(mip); auto mipDimensions = texture.evalMipDimensions(mip);
uint16_t targetMip = mip - destAllocatedMip; uint16_t targetMip = mip - destMipOffset;
uint16_t sourceMip = mip - srcAllocatedMip; uint16_t sourceMip = mip - srcMipOffset;
auto faces = GLTexture::getFaceCount(texTarget); auto faces = GLTexture::getFaceCount(texTarget);
for (uint8_t face = 0; face < faces; ++face) { for (uint8_t face = 0; face < faces; ++face) {
glCopyImageSubData( glCopyImageSubData(