ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gsdx-ogl-wnd: Build fix 

git-svn-id: http://pcsx2.googlecode.com/svn/branches/gsdx-ogl-wnd@5509 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
ramapcsx2 2013-01-12 23:41:31 +00:00
parent f82421eaf7
commit c09f758602
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/GSdx/GSDeviceOGL.cpp
View File

@ -1336,12 +1336,12 @@ void GSDeviceOGL::OMSetRenderTargets(GSTexture* rt, GSTexture* ds, const GSVecto
m_state.dsv = static_cast<GSTextureOGL*>(ds); m_state.dsv = static_cast<GSTextureOGL*>(ds);
if (static_cast<GSTextureOGL*>(rt)->IsBackbuffer()) { if (static_cast<GSTextureOGL*>(rt)->IsBackbuffer()) {
assert(ds == NULL); // no depth-stencil without FBO ASSERT(ds == NULL); // no depth-stencil without FBO
OMSetFBO(0); OMSetFBO(0);
} else { } else {
assert(rt != NULL); // a render target must exists ASSERT(rt != NULL); // a render target must exists
// FIXME DEBUG special case for GL_R16UI // FIXME DEBUG special case for GL_R16UI
if (rt->GetFormat() == GL_R16UI) { if (rt->GetFormat() == GL_R16UI) {
@ -1426,7 +1426,7 @@ void GSDeviceOGL::CompileShaderFromSource(const std::string& glsl_file, const st
case GL_FRAGMENT_SHADER: case GL_FRAGMENT_SHADER:
shader_type = "#define FRAGMENT_SHADER 1\n"; shader_type = "#define FRAGMENT_SHADER 1\n";
break; break;
default: assert(0); default: ASSERT(0);
} }
// Select the entry point ie the main function // Select the entry point ie the main function

10
plugins/GSdx/GSTextureOGL.cpp
View File

@ -108,7 +108,7 @@ GSTextureOGL::GSTextureOGL(int type, int w, int h, bool msaa, int format, GLuint
else if (m_format == GL_R16UI) m_pbo_size = m_size.x * m_size.y * 2; else if (m_format == GL_R16UI) m_pbo_size = m_size.x * m_size.y * 2;
else { else {
fprintf(stderr, "wrong texture pixel format :%x\n", m_format); fprintf(stderr, "wrong texture pixel format :%x\n", m_format);
assert(0); // TODO Later ASSERT(0); // TODO Later
} }
glBindBuffer(GL_PIXEL_PACK_BUFFER, m_pbo_id); glBindBuffer(GL_PIXEL_PACK_BUFFER, m_pbo_id);
@ -135,7 +135,7 @@ GSTextureOGL::GSTextureOGL(int type, int w, int h, bool msaa, int format, GLuint
glTexImage2D(m_texture_target, 0, m_format, m_size.x, m_size.y, 0, GL_RED, GL_UNSIGNED_BYTE, NULL); glTexImage2D(m_texture_target, 0, m_format, m_size.x, m_size.y, 0, GL_RED, GL_UNSIGNED_BYTE, NULL);
else { else {
fprintf(stderr, "wrong texture pixel format :%x\n", m_format); fprintf(stderr, "wrong texture pixel format :%x\n", m_format);
assert(0); // TODO Later ASSERT(0); // TODO Later
} }
break; break;
default: break; default: break;
@ -158,7 +158,7 @@ void GSTextureOGL::Attach(GLenum attachment)
bool GSTextureOGL::Update(const GSVector4i& r, const void* data, int pitch) bool GSTextureOGL::Update(const GSVector4i& r, const void* data, int pitch)
{ {
if (m_type == GSTexture::DepthStencil || m_type == GSTexture::Offscreen) assert(0); if (m_type == GSTexture::DepthStencil || m_type == GSTexture::Offscreen) ASSERT(0);
// FIXME warning order of the y axis // FIXME warning order of the y axis
// FIXME I'm not confident with GL_UNSIGNED_BYTE type // FIXME I'm not confident with GL_UNSIGNED_BYTE type
@ -179,7 +179,7 @@ bool GSTextureOGL::Update(const GSVector4i& r, const void* data, int pitch)
glTexSubImage2D(m_texture_target, 0, r.x, r.y, r.width(), r.height(), GL_RED, GL_R8, data); glTexSubImage2D(m_texture_target, 0, r.x, r.y, r.width(), r.height(), GL_RED, GL_R8, data);
else { else {
fprintf(stderr, "wrong texture pixel format :%x\n", m_format); fprintf(stderr, "wrong texture pixel format :%x\n", m_format);
assert(0); ASSERT(0);
} }
#if 0 #if 0
//if (m_size.x != 16) //if (m_size.x != 16)
@ -259,7 +259,7 @@ bool GSTextureOGL::Map(GSMap& m, const GSVector4i* r)
glReadPixels(0, 0, m_size.x, m_size.y, GL_RED, GL_UNSIGNED_BYTE, 0); glReadPixels(0, 0, m_size.x, m_size.y, GL_RED, GL_UNSIGNED_BYTE, 0);
} else { } else {
fprintf(stderr, "wrong texture pixel format :%x\n", m_format); fprintf(stderr, "wrong texture pixel format :%x\n", m_format);
assert(0); ASSERT(0);
} }
glBindFramebuffer(GL_READ_FRAMEBUFFER, 0); glBindFramebuffer(GL_READ_FRAMEBUFFER, 0);