Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-08 07:12:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

PR comments

Browse source
This commit is contained in:
Brad Davis 2017-03-21 16:57:53 -07:00
parent a3828ce45c
commit e60108cc8c
5 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libraries/gpu/src/gpu/Texture.h
View file

@ -163,6 +163,7 @@ class Texture : public Resource {
static void updateTextureCPUMemoryUsage(Size prevObjectSize, Size newObjectSize);
public:
static const uint32_t CUBE_FACE_COUNT { 6 };
static uint32_t getTextureCPUCount();
static Size getTextureCPUMemoryUsage();
static uint32_t getTextureGPUCount();

6
libraries/gpu/src/gpu/Texture_ktx.cpp
View file

@ -113,7 +113,7 @@ ktx::KTXUniquePointer Texture::serialize(const Texture& texture) {
} else {
header.setCube(texture.getWidth(), texture.getHeight());
}
numFaces = 6;
numFaces = Texture::CUBE_FACE_COUNT;
break;
}
default:
@ -130,9 +130,9 @@ ktx::KTXUniquePointer Texture::serialize(const Texture& texture) {
if (numFaces == 1) {
images.emplace_back(ktx::Image((uint32_t)mip->getSize(), 0, mip->readData()));
} else {
ktx::Image::FaceBytes cubeFaces(6);
ktx::Image::FaceBytes cubeFaces(Texture::CUBE_FACE_COUNT);
cubeFaces[0] = mip->readData();
for (int face = 1; face < 6; face++) {
for (uint32_t face = 1; face < Texture::CUBE_FACE_COUNT; face++) {
cubeFaces[face] = texture.accessStoredMipFace(level, face)->readData();
}
images.emplace_back(ktx::Image((uint32_t)mip->getSize(), 0, cubeFaces));

2
libraries/ktx/src/ktx/KTX.cpp
View file

@ -63,7 +63,7 @@ size_t Header::evalFaceSize(uint32_t level) const {
}
size_t Header::evalImageSize(uint32_t level) const {
auto faceSize = evalFaceSize(level);
if (numberOfFaces == 6 && numberOfArrayElements == 0) {
if (numberOfFaces == NUM_CUBEMAPFACES && numberOfArrayElements == 0) {
return faceSize;
} else {
return (getNumberOfSlices() * numberOfFaces * faceSize);

8
libraries/ktx/src/ktx/Reader.cpp
View file

@ -151,10 +151,10 @@ namespace ktx {
if ((currentPtr - srcBytes) + imageSize <= (srcSize)) {
auto padding = Header::evalPadding(imageSize);
if (numFaces == 6) {
size_t faceSize = imageSize / 6;
Image::FaceBytes faces(6);
for (uint32_t face = 0; face < 6; face++) {
if (numFaces == NUM_CUBEMAPFACES) {
size_t faceSize = imageSize / NUM_CUBEMAPFACES;
Image::FaceBytes faces(NUM_CUBEMAPFACES);
for (uint32_t face = 0; face < NUM_CUBEMAPFACES; face++) {
faces[face] = currentPtr;
currentPtr += faceSize;
}

4
libraries/ktx/src/ktx/Writer.cpp
View file

@ -149,9 +149,9 @@ namespace ktx {
destImages.emplace_back(Image((uint32_t) imageSize, padding, currentPtr));
currentPtr += imageSize;
} else {
Image::FaceBytes faceBytes(6);
Image::FaceBytes faceBytes(NUM_CUBEMAPFACES);
auto faceSize = srcImages[l]._faceSize;
for (int face = 0; face < 6; face++) {
for (int face = 0; face < NUM_CUBEMAPFACES; face++) {
memcpy(currentPtr, srcImages[l]._faceBytes[face], faceSize);
faceBytes[face] = currentPtr;
currentPtr += faceSize;