diff --git a/projects/msvc12/GLideN64.vcxproj b/projects/msvc12/GLideN64.vcxproj
index 659d4039..e7012682 100644
--- a/projects/msvc12/GLideN64.vcxproj
+++ b/projects/msvc12/GLideN64.vcxproj
@@ -308,7 +308,7 @@
-
+
@@ -444,7 +444,7 @@
-
+
diff --git a/projects/msvc12/GLideN64.vcxproj.filters b/projects/msvc12/GLideN64.vcxproj.filters
index 12ba80e9..869a53f7 100644
--- a/projects/msvc12/GLideN64.vcxproj.filters
+++ b/projects/msvc12/GLideN64.vcxproj.filters
@@ -323,7 +323,7 @@
Source Files\Graphics\OpenGL
-
+
Source Files\Graphics\OpenGL
@@ -625,7 +625,7 @@
Header Files\Graphics\OpenGL
-
+
Header Files\Graphics\OpenGL
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 47fc5114..272f8d34 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -71,7 +71,7 @@ set(GLideN64_SOURCES
Graphics/OpenGLContext/opengl_BufferedDrawer.cpp
Graphics/OpenGLContext/opengl_BufferManipulationObjectFactory.cpp
Graphics/OpenGLContext/opengl_CachedFunctions.cpp
- Graphics/OpenGLContext/opengl_ColorBufferReaderWithBufferStore.cpp
+ Graphics/OpenGLContext/opengl_ColorBufferReaderWithBufferStorage.cpp
Graphics/OpenGLContext/opengl_ColorBufferReaderWithPixelBuffer.cpp
Graphics/OpenGLContext/opengl_ColorBufferReaderWithReadPixels.cpp
Graphics/OpenGLContext/opengl_ContextImpl.cpp
diff --git a/src/Graphics/OpenGLContext/opengl_ColorBufferReaderWithBufferStore.cpp b/src/Graphics/OpenGLContext/opengl_ColorBufferReaderWithBufferStorage.cpp
similarity index 83%
rename from src/Graphics/OpenGLContext/opengl_ColorBufferReaderWithBufferStore.cpp
rename to src/Graphics/OpenGLContext/opengl_ColorBufferReaderWithBufferStorage.cpp
index 722921b8..956feca9 100644
--- a/src/Graphics/OpenGLContext/opengl_ColorBufferReaderWithBufferStore.cpp
+++ b/src/Graphics/OpenGLContext/opengl_ColorBufferReaderWithBufferStorage.cpp
@@ -1,22 +1,22 @@
#include
-#include "opengl_ColorBufferReaderWithBufferStore.h"
+#include "opengl_ColorBufferReaderWithBufferStorage.h"
using namespace graphics;
using namespace opengl;
-ColorBufferReaderWithBufferStore::ColorBufferReaderWithBufferStore(CachedTexture * _pTexture,
+ColorBufferReaderWithBufferStorage::ColorBufferReaderWithBufferStorage(CachedTexture * _pTexture,
CachedBindBuffer * _bindBuffer)
: ColorBufferReader(_pTexture), m_bindBuffer(_bindBuffer)
{
_initBuffers();
}
-ColorBufferReaderWithBufferStore::~ColorBufferReaderWithBufferStore()
+ColorBufferReaderWithBufferStorage::~ColorBufferReaderWithBufferStorage()
{
_destroyBuffers();
}
-void ColorBufferReaderWithBufferStore::_initBuffers()
+void ColorBufferReaderWithBufferStorage::_initBuffers()
{
// Generate Pixel Buffer Objects
glGenBuffers(_numPBO, m_PBO);
@@ -33,7 +33,7 @@ void ColorBufferReaderWithBufferStore::_initBuffers()
m_bindBuffer->bind(Parameter(GL_PIXEL_PACK_BUFFER), ObjectHandle::null);
}
-void ColorBufferReaderWithBufferStore::_destroyBuffers()
+void ColorBufferReaderWithBufferStorage::_destroyBuffers()
{
glDeleteBuffers(_numPBO, m_PBO);
@@ -41,7 +41,7 @@ void ColorBufferReaderWithBufferStore::_destroyBuffers()
m_PBO[index] = 0;
}
-u8 * ColorBufferReaderWithBufferStore::readPixels(s32 _x0, s32 _y0, u32 _width, u32 _height, u32 _size, bool _sync)
+u8 * ColorBufferReaderWithBufferStorage::readPixels(s32 _x0, s32 _y0, u32 _width, u32 _height, u32 _size, bool _sync)
{
const FramebufferTextureFormats & fbTexFormat = gfxContext.getFramebufferTextureFormats();
GLenum colorFormat, colorType, colorFormatBytes;
@@ -88,7 +88,7 @@ u8 * ColorBufferReaderWithBufferStore::readPixels(s32 _x0, s32 _y0, u32 _width,
return pixelDataAlloc;
}
-void ColorBufferReaderWithBufferStore::cleanUp()
+void ColorBufferReaderWithBufferStorage::cleanUp()
{
m_bindBuffer->bind(Parameter(GL_PIXEL_PACK_BUFFER), ObjectHandle::null);
}
diff --git a/src/Graphics/OpenGLContext/opengl_ColorBufferReaderWithBufferStore.h b/src/Graphics/OpenGLContext/opengl_ColorBufferReaderWithBufferStorage.h
similarity index 77%
rename from src/Graphics/OpenGLContext/opengl_ColorBufferReaderWithBufferStore.h
rename to src/Graphics/OpenGLContext/opengl_ColorBufferReaderWithBufferStorage.h
index 20107534..cfca6d2e 100644
--- a/src/Graphics/OpenGLContext/opengl_ColorBufferReaderWithBufferStore.h
+++ b/src/Graphics/OpenGLContext/opengl_ColorBufferReaderWithBufferStorage.h
@@ -5,13 +5,13 @@
namespace opengl {
- class ColorBufferReaderWithBufferStore :
+ class ColorBufferReaderWithBufferStorage :
public graphics::ColorBufferReader
{
public:
- ColorBufferReaderWithBufferStore(CachedTexture * _pTexture,
+ ColorBufferReaderWithBufferStorage(CachedTexture * _pTexture,
CachedBindBuffer * _bindBuffer);
- virtual ~ColorBufferReaderWithBufferStore();
+ virtual ~ColorBufferReaderWithBufferStorage();
u8 * readPixels(s32 _x0, s32 _y0, u32 _width, u32 _height, u32 _size, bool _sync) override;
void cleanUp() override;
diff --git a/src/Graphics/OpenGLContext/opengl_ContextImpl.cpp b/src/Graphics/OpenGLContext/opengl_ContextImpl.cpp
index 8da95676..77de53fa 100644
--- a/src/Graphics/OpenGLContext/opengl_ContextImpl.cpp
+++ b/src/Graphics/OpenGLContext/opengl_ContextImpl.cpp
@@ -6,7 +6,7 @@
#include "opengl_BufferedDrawer.h"
#include "opengl_UnbufferedDrawer.h"
#include "opengl_ColorBufferReaderWithPixelBuffer.h"
-#include "opengl_ColorBufferReaderWithBufferStore.h"
+#include "opengl_ColorBufferReaderWithBufferStorage.h"
#include "opengl_ColorBufferReaderWithEGLImage.h"
#include "opengl_ColorBufferReaderWithReadPixels.h"
#include "opengl_Utils.h"
@@ -304,7 +304,7 @@ graphics::PixelReadBuffer * ContextImpl::createPixelReadBuffer(size_t _sizeInByt
graphics::ColorBufferReader * ContextImpl::createColorBufferReader(CachedTexture * _pTexture)
{
if (m_glInfo.bufferStorage)
- return new ColorBufferReaderWithBufferStore(_pTexture, m_cachedFunctions->getCachedBindBuffer());
+ return new ColorBufferReaderWithBufferStorage(_pTexture, m_cachedFunctions->getCachedBindBuffer());
if (!m_glInfo.isGLES2)
return new ColorBufferReaderWithPixelBuffer(_pTexture, m_cachedFunctions->getCachedBindBuffer());
diff --git a/src/mupen64plus-video-gliden64.mk b/src/mupen64plus-video-gliden64.mk
index cfdf4b4b..e71fb4dd 100644
--- a/src/mupen64plus-video-gliden64.mk
+++ b/src/mupen64plus-video-gliden64.mk
@@ -85,10 +85,10 @@ MY_LOCAL_SRC_FILES := \
$(SRCDIR)/Graphics/OpenGLContext/opengl_BufferedDrawer.cpp \
$(SRCDIR)/Graphics/OpenGLContext/opengl_BufferManipulationObjectFactory.cpp \
$(SRCDIR)/Graphics/OpenGLContext/opengl_CachedFunctions.cpp \
+ $(SRCDIR)/Graphics/OpenGLContext/opengl_ColorBufferReaderWithBufferStorage.cpp \
$(SRCDIR)/Graphics/OpenGLContext/opengl_ColorBufferReaderWithPixelBuffer.cpp \
$(SRCDIR)/Graphics/OpenGLContext/opengl_ColorBufferReaderWithReadPixels.cpp \
$(SRCDIR)/Graphics/OpenGLContext/opengl_ColorBufferReaderWithEGLImage.cpp \
- $(SRCDIR)/Graphics/OpenGLContext/opengl_ColorBufferReaderWithBufferStore.cpp \
$(SRCDIR)/Graphics/OpenGLContext/opengl_ContextImpl.cpp \
$(SRCDIR)/Graphics/OpenGLContext/opengl_GLInfo.cpp \
$(SRCDIR)/Graphics/OpenGLContext/opengl_Parameters.cpp \