Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-02-11 17:18:37 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

thin3d: Auto gen mips only once per tex.

Browse Source
This commit is contained in:
Unknown W. Brackets 2016-01-23 11:22:40 -08:00
parent 5827cab6e5
commit 43218ea953
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ext/native/thin3d/thin3d_gl.cpp
View File

@ -427,6 +427,7 @@ GLuint TypeToTarget(T3DTextureType type) {
class Thin3DGLTexture : public Thin3DTexture, GfxResourceHolder { class Thin3DGLTexture : public Thin3DTexture, GfxResourceHolder {
public: public:
Thin3DGLTexture() : tex_(0), target_(0) { Thin3DGLTexture() : tex_(0), target_(0) {
generatedMips_ = false;
width_ = 0; width_ = 0;
height_ = 0; height_ = 0;
depth_ = 0; depth_ = 0;
@ -434,6 +435,7 @@ public:
register_gl_resource_holder(this); register_gl_resource_holder(this);
} }
Thin3DGLTexture(T3DTextureType type, T3DImageFormat format, int width, int height, int depth, int mipLevels) : tex_(0), target_(TypeToTarget(type)), format_(format), mipLevels_(mipLevels) { Thin3DGLTexture(T3DTextureType type, T3DImageFormat format, int width, int height, int depth, int mipLevels) : tex_(0), target_(TypeToTarget(type)), format_(format), mipLevels_(mipLevels) {
generatedMips_ = false;
width_ = width; width_ = width;
height_ = height; height_ = height;
depth_ = depth; depth_ = depth;
@ -446,6 +448,7 @@ public:
} }
bool Create(T3DTextureType type, T3DImageFormat format, int width, int height, int depth, int mipLevels) override { bool Create(T3DTextureType type, T3DImageFormat format, int width, int height, int depth, int mipLevels) override {
generatedMips_ = false;
format_ = format; format_ = format;
target_ = TypeToTarget(type); target_ = TypeToTarget(type);
mipLevels_ = mipLevels; mipLevels_ = mipLevels;
@ -459,6 +462,7 @@ public:
if (tex_) { if (tex_) {
glDeleteTextures(1, &tex_); glDeleteTextures(1, &tex_);
tex_ = 0; tex_ = 0;
generatedMips_ = false;
} }
} }
void SetImageData(int x, int y, int z, int width, int height, int depth, int level, int stride, const uint8_t *data) override; void SetImageData(int x, int y, int z, int width, int height, int depth, int level, int stride, const uint8_t *data) override;
@ -469,6 +473,7 @@ public:
} }
void GLLost() override { void GLLost() override {
generatedMips_ = false;
if (!filename_.empty()) { if (!filename_.empty()) {
if (LoadFromFile(filename_.c_str())) { if (LoadFromFile(filename_.c_str())) {
ILOG("Reloaded lost texture %s", filename_.c_str()); ILOG("Reloaded lost texture %s", filename_.c_str());
@ -488,6 +493,7 @@ private:
T3DImageFormat format_; T3DImageFormat format_;
int mipLevels_; int mipLevels_;
bool generatedMips_;
}; };
Thin3DTexture *Thin3DGLContext::CreateTexture() { Thin3DTexture *Thin3DGLContext::CreateTexture() {
@ -499,9 +505,12 @@ Thin3DTexture *Thin3DGLContext::CreateTexture(T3DTextureType type, T3DImageForma
} }
void Thin3DGLTexture::AutoGenMipmaps() { void Thin3DGLTexture::AutoGenMipmaps() {
Bind(); if (!generatedMips_) {
glGenerateMipmap(target_); Bind();
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_NEAREST); glGenerateMipmap(target_);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_NEAREST);
generatedMips_ = true;
}
} }
void Thin3DGLTexture::SetImageData(int x, int y, int z, int width, int height, int depth, int level, int stride, const uint8_t *data) { void Thin3DGLTexture::SetImageData(int x, int y, int z, int width, int height, int depth, int level, int stride, const uint8_t *data) {