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

Rename opengl_ColorBufferReaderWithBUfferStorage.h/cpp

Browse Source 
This allow compilation with clang in Anroid Studio with Windows. This file
name was too long for some reason.
This commit is contained in:
Francisco Zurita 2017-02-25 00:55:06 -05:00
parent 8f23030462
commit 58ddf8822c
7 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
projects/msvc12/GLideN64.vcxproj
View File

@ -308,7 +308,7 @@
<ClCompile Include="..\..\src\Graphics\OpenGLContext\opengl_Attributes.cpp" />
<ClCompile Include="..\..\src\Graphics\OpenGLContext\opengl_BufferManipulationObjectFactory.cpp" />
<ClCompile Include="..\..\src\Graphics\OpenGLContext\opengl_CachedFunctions.cpp" />
<ClCompile Include="..\..\src\Graphics\OpenGLContext\opengl_ColorBufferReaderWithBufferStorage.cpp" />
<ClCompile Include="..\..\src\Graphics\OpenGLContext\opengl_ColorBufferReaderWithBufferStore.cpp" />
<ClCompile Include="..\..\src\Graphics\OpenGLContext\opengl_ColorBufferReaderWithPixelBuffer.cpp" />
<ClCompile Include="..\..\src\Graphics\OpenGLContext\opengl_ColorBufferReaderWithReadPixels.cpp" />
<ClCompile Include="..\..\src\Graphics\OpenGLContext\opengl_ContextImpl.cpp" />
@ -444,7 +444,7 @@
<ClInclude Include="..\..\src\Graphics\OpenGLContext\opengl_Attributes.h" />
<ClInclude Include="..\..\src\Graphics\OpenGLContext\opengl_BufferManipulationObjectFactory.h" />
<ClInclude Include="..\..\src\Graphics\OpenGLContext\opengl_CachedFunctions.h" />
<ClInclude Include="..\..\src\Graphics\OpenGLContext\opengl_ColorBufferReaderWithBufferStorage.h" />
<ClInclude Include="..\..\src\Graphics\OpenGLContext\opengl_ColorBufferReaderWithBufferStore.h" />
<ClInclude Include="..\..\src\Graphics\OpenGLContext\opengl_ColorBufferReaderWithPixelBuffer.h" />
<ClInclude Include="..\..\src\Graphics\OpenGLContext\opengl_ColorBufferReaderWithReadPixels.h" />
<ClInclude Include="..\..\src\Graphics\OpenGLContext\opengl_ContextImpl.h" />

4
projects/msvc12/GLideN64.vcxproj.filters
View File

@ -323,7 +323,7 @@
<ClCompile Include="..\..\src\Graphics\OpenGLContext\opengl_ColorBufferReaderWithPixelBuffer.cpp">
<Filter>Source Files\Graphics\OpenGL</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Graphics\OpenGLContext\opengl_ColorBufferReaderWithBufferStorage.cpp">
<ClCompile Include="..\..\src\Graphics\OpenGLContext\opengl_ColorBufferReaderWithBufferStore.cpp">
<Filter>Source Files\Graphics\OpenGL</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Graphics\OpenGLContext\opengl_BufferedDrawer.cpp">
@ -625,7 +625,7 @@
<ClInclude Include="..\..\src\Graphics\OpenGLContext\opengl_ColorBufferReaderWithPixelBuffer.h">
<Filter>Header Files\Graphics\OpenGL</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Graphics\OpenGLContext\opengl_ColorBufferReaderWithBufferStorage.h">
<ClInclude Include="..\..\src\Graphics\OpenGLContext\opengl_ColorBufferReaderWithBufferStore.h">
<Filter>Header Files\Graphics\OpenGL</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Graphics\OpenGLContext\opengl_BufferedDrawer.h">

2
src/CMakeLists.txt
View File

@ -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

14
src/Graphics/OpenGLContext/opengl_ColorBufferReaderWithBufferStorage.cpp → src/Graphics/OpenGLContext/opengl_ColorBufferReaderWithBufferStore.cpp
View File

@ -1,22 +1,22 @@
#include <Graphics/Context.h>
#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);
}

6
src/Graphics/OpenGLContext/opengl_ColorBufferReaderWithBufferStorage.h → src/Graphics/OpenGLContext/opengl_ColorBufferReaderWithBufferStore.h
View File

@ -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;

4
src/Graphics/OpenGLContext/opengl_ContextImpl.cpp
View File

@ -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());

2
src/mupen64plus-video-gliden64.mk
View File

@ -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 \