MGislv/GLideN64
1
0
Fork 0
mirror of https://github.com/blawar/GLideN64.git synced 2024-07-07 03:13:49 +00:00
Code Issues Projects Releases Wiki Activity

Optimize NoiseTexture update: do not create new buffer data on each update.

Browse Source
This commit is contained in:
Sergey Lipskiy 2015-09-21 21:42:42 +06:00
parent a73b8dddbd
commit 2ec48ee251
2 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/GLES2/GLSLCombiner_gles2.cpp
View File

@ -1,6 +1,7 @@
#include <assert.h>
#include <stdio.h>
#include <string>
#include <memory>
#include "../N64.h"
#include "../OpenGL.h"
@ -31,14 +32,14 @@ static std::string strFragmentShader;
class NoiseTexture
{
public:
NoiseTexture() : m_pTexture(NULL), m_PBO(0), m_DList(0) {}
NoiseTexture() : m_pTexture(nullptr), m_pData(nullptr), m_PBO(0), m_DList(0) {}
void init();
void destroy();
void update();
private:
CachedTexture * m_pTexture;
GLubyte* m_PBO;
std::unique_ptr<GLubyte[]> m_pData;
u32 m_DList;
} noiseTex;
@ -62,13 +63,14 @@ void NoiseTexture::init()
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
glBindTexture(GL_TEXTURE_2D, 0);
m_pData.reset(new GLubyte[640 * 580]);
}
void NoiseTexture::destroy()
{
if (m_pTexture != NULL) {
if (m_pTexture != nullptr) {
textureCache().removeFrameBufferTexture(m_pTexture);
m_pTexture = NULL;
m_pTexture = nullptr;
}
}
@ -76,22 +78,18 @@ void NoiseTexture::update()
{
if (m_DList == RSP.DList || config.generalEmulation.enableNoise == 0)
return;
const u32 dataSize = VI.width*VI.height;
if (dataSize == 0)
return;
m_PBO = (GLubyte*)malloc(dataSize);
GLubyte* ptr = m_PBO;
PBOBinder binder(m_PBO);
if (ptr == NULL)
if (VI.width*VI.height == 0)
return;
for (u32 y = 0; y < VI.height; ++y) {
for (u32 x = 0; x < VI.width; ++x)
ptr[x + y*VI.width] = rand()&0xFF;
m_pData[x + y*VI.width] = rand() & 0xFF;
}
glActiveTexture(GL_TEXTURE0 + g_noiseTexIndex);
glBindTexture(GL_TEXTURE_2D, m_pTexture->glName);
glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, VI.width, VI.height, GL_LUMINANCE, GL_UNSIGNED_BYTE, m_PBO);
glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, VI.width, VI.height, GL_LUMINANCE, GL_UNSIGNED_BYTE, m_pData.get());
m_DList = RSP.DList;
}

5
src/OGL3X/GLSLCombiner_ogl3x.cpp
View File

@ -73,8 +73,10 @@ void NoiseTexture::init()
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
glBindTexture(GL_TEXTURE_2D, 0);
// Generate Pixel Buffer Object. Initialize it later
// Generate Pixel Buffer Object. Initialize it with max buffer size.
glGenBuffers(1, &m_PBO);
PBOBinder binder(GL_PIXEL_UNPACK_BUFFER, m_PBO);
glBufferData(GL_PIXEL_UNPACK_BUFFER, 640*580, NULL, GL_DYNAMIC_DRAW);
}
void NoiseTexture::destroy()
@ -95,7 +97,6 @@ void NoiseTexture::update()
if (dataSize == 0)
return;
PBOBinder binder(GL_PIXEL_UNPACK_BUFFER, m_PBO);
glBufferData(GL_PIXEL_UNPACK_BUFFER, dataSize, NULL, GL_DYNAMIC_DRAW);
GLubyte* ptr = (GLubyte*)glMapBufferRange(GL_PIXEL_UNPACK_BUFFER, 0, dataSize, GL_MAP_WRITE_BIT);
if (ptr == NULL)
return;