From 58ddf8822c9632980890190325791abf3375e61a Mon Sep 17 00:00:00 2001 From: Francisco Zurita Date: Sat, 25 Feb 2017 00:55:06 -0500 Subject: [PATCH] Rename opengl_ColorBufferReaderWithBUfferStorage.h/cpp This allow compilation with clang in Anroid Studio with Windows. This file name was too long for some reason. --- projects/msvc12/GLideN64.vcxproj | 4 ++-- projects/msvc12/GLideN64.vcxproj.filters | 4 ++-- src/CMakeLists.txt | 2 +- ...=> opengl_ColorBufferReaderWithBufferStore.cpp} | 14 +++++++------- ...h => opengl_ColorBufferReaderWithBufferStore.h} | 6 +++--- src/Graphics/OpenGLContext/opengl_ContextImpl.cpp | 4 ++-- src/mupen64plus-video-gliden64.mk | 2 +- 7 files changed, 18 insertions(+), 18 deletions(-) rename src/Graphics/OpenGLContext/{opengl_ColorBufferReaderWithBufferStorage.cpp => opengl_ColorBufferReaderWithBufferStore.cpp} (83%) rename src/Graphics/OpenGLContext/{opengl_ColorBufferReaderWithBufferStorage.h => opengl_ColorBufferReaderWithBufferStore.h} (77%) diff --git a/projects/msvc12/GLideN64.vcxproj b/projects/msvc12/GLideN64.vcxproj index e7012682..659d4039 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 869a53f7..12ba80e9 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 f932d2eb..724f7fa1 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_ColorBufferReaderWithBufferStorage.cpp + Graphics/OpenGLContext/opengl_ColorBufferReaderWithBufferStore.cpp Graphics/OpenGLContext/opengl_ColorBufferReaderWithPixelBuffer.cpp Graphics/OpenGLContext/opengl_ColorBufferReaderWithReadPixels.cpp Graphics/OpenGLContext/opengl_ContextImpl.cpp diff --git a/src/Graphics/OpenGLContext/opengl_ColorBufferReaderWithBufferStorage.cpp b/src/Graphics/OpenGLContext/opengl_ColorBufferReaderWithBufferStore.cpp similarity index 83% rename from src/Graphics/OpenGLContext/opengl_ColorBufferReaderWithBufferStorage.cpp rename to src/Graphics/OpenGLContext/opengl_ColorBufferReaderWithBufferStore.cpp index 956feca9..722921b8 100644 --- a/src/Graphics/OpenGLContext/opengl_ColorBufferReaderWithBufferStorage.cpp +++ b/src/Graphics/OpenGLContext/opengl_ColorBufferReaderWithBufferStore.cpp @@ -1,22 +1,22 @@ #include -#include "opengl_ColorBufferReaderWithBufferStorage.h" +#include "opengl_ColorBufferReaderWithBufferStore.h" using namespace graphics; using namespace opengl; -ColorBufferReaderWithBufferStorage::ColorBufferReaderWithBufferStorage(CachedTexture * _pTexture, +ColorBufferReaderWithBufferStore::ColorBufferReaderWithBufferStore(CachedTexture * _pTexture, CachedBindBuffer * _bindBuffer) : ColorBufferReader(_pTexture), m_bindBuffer(_bindBuffer) { _initBuffers(); } -ColorBufferReaderWithBufferStorage::~ColorBufferReaderWithBufferStorage() +ColorBufferReaderWithBufferStore::~ColorBufferReaderWithBufferStore() { _destroyBuffers(); } -void ColorBufferReaderWithBufferStorage::_initBuffers() +void ColorBufferReaderWithBufferStore::_initBuffers() { // Generate Pixel Buffer Objects glGenBuffers(_numPBO, m_PBO); @@ -33,7 +33,7 @@ void ColorBufferReaderWithBufferStorage::_initBuffers() m_bindBuffer->bind(Parameter(GL_PIXEL_PACK_BUFFER), ObjectHandle::null); } -void ColorBufferReaderWithBufferStorage::_destroyBuffers() +void ColorBufferReaderWithBufferStore::_destroyBuffers() { glDeleteBuffers(_numPBO, m_PBO); @@ -41,7 +41,7 @@ void ColorBufferReaderWithBufferStorage::_destroyBuffers() m_PBO[index] = 0; } -u8 * ColorBufferReaderWithBufferStorage::readPixels(s32 _x0, s32 _y0, u32 _width, u32 _height, u32 _size, bool _sync) +u8 * ColorBufferReaderWithBufferStore::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 * ColorBufferReaderWithBufferStorage::readPixels(s32 _x0, s32 _y0, u32 _width return pixelDataAlloc; } -void ColorBufferReaderWithBufferStorage::cleanUp() +void ColorBufferReaderWithBufferStore::cleanUp() { m_bindBuffer->bind(Parameter(GL_PIXEL_PACK_BUFFER), ObjectHandle::null); } diff --git a/src/Graphics/OpenGLContext/opengl_ColorBufferReaderWithBufferStorage.h b/src/Graphics/OpenGLContext/opengl_ColorBufferReaderWithBufferStore.h similarity index 77% rename from src/Graphics/OpenGLContext/opengl_ColorBufferReaderWithBufferStorage.h rename to src/Graphics/OpenGLContext/opengl_ColorBufferReaderWithBufferStore.h index cfca6d2e..20107534 100644 --- a/src/Graphics/OpenGLContext/opengl_ColorBufferReaderWithBufferStorage.h +++ b/src/Graphics/OpenGLContext/opengl_ColorBufferReaderWithBufferStore.h @@ -5,13 +5,13 @@ namespace opengl { - class ColorBufferReaderWithBufferStorage : + class ColorBufferReaderWithBufferStore : public graphics::ColorBufferReader { public: - ColorBufferReaderWithBufferStorage(CachedTexture * _pTexture, + ColorBufferReaderWithBufferStore(CachedTexture * _pTexture, CachedBindBuffer * _bindBuffer); - virtual ~ColorBufferReaderWithBufferStorage(); + virtual ~ColorBufferReaderWithBufferStore(); 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 05422517..6606d470 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_ColorBufferReaderWithBufferStorage.h" +#include "opengl_ColorBufferReaderWithBufferStore.h" #include "opengl_ColorBufferReaderWithEGLImage.h" #include "opengl_ColorBufferReaderWithReadPixels.h" #include "opengl_Utils.h" @@ -299,7 +299,7 @@ graphics::PixelReadBuffer * ContextImpl::createPixelReadBuffer(size_t _sizeInByt graphics::ColorBufferReader * ContextImpl::createColorBufferReader(CachedTexture * _pTexture) { if (m_glInfo.bufferStorage) - return new ColorBufferReaderWithBufferStorage(_pTexture, m_cachedFunctions->getCachedBindBuffer()); + return new ColorBufferReaderWithBufferStore(_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 9b942ed3..032a2829 100644 --- a/src/mupen64plus-video-gliden64.mk +++ b/src/mupen64plus-video-gliden64.mk @@ -86,10 +86,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 \