summaryrefslogtreecommitdiff
path: root/Source/Core/VideoBackends/Software
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2014-10-26 04:53:22 -0400
committerLioncash <mathew1800@gmail.com>2014-10-26 04:54:58 -0400
commit49b94e52858e5869ea2872ed75810ba075cfa0eb (patch)
tree39f2911237486cd32287ea2b528710e5997ee22c /Source/Core/VideoBackends/Software
parentf895648eb95369e2d302ba93cc4354d3880a7337 (diff)
OGL: Get rid of error macros
Diffstat (limited to 'Source/Core/VideoBackends/Software')
-rw-r--r--Source/Core/VideoBackends/Software/HwRasterizer.cpp8
-rw-r--r--Source/Core/VideoBackends/Software/RasterFont.cpp4
-rw-r--r--Source/Core/VideoBackends/Software/SWRenderer.cpp4
3 files changed, 1 insertions, 15 deletions
diff --git a/Source/Core/VideoBackends/Software/HwRasterizer.cpp b/Source/Core/VideoBackends/Software/HwRasterizer.cpp
index 6847372691..60f97cb14d 100644
--- a/Source/Core/VideoBackends/Software/HwRasterizer.cpp
+++ b/Source/Core/VideoBackends/Software/HwRasterizer.cpp
@@ -152,8 +152,6 @@ namespace HwRasterizer
texType = GL_TEXTURE_RECTANGLE;
else
texType = GL_TEXTURE_2D;
-
- GL_REPORT_ERRORD();
}
static float width, height;
static void LoadTexture()
@@ -178,7 +176,6 @@ namespace HwRasterizer
glBindTexture(texType, cacheEntry.texture);
glTexParameteri(texType, GL_TEXTURE_MAG_FILTER, texUnit.texMode0[0].mag_filter ? GL_LINEAR : GL_NEAREST);
glTexParameteri(texType, GL_TEXTURE_MIN_FILTER, (texUnit.texMode0[0].min_filter >= 4) ? GL_LINEAR : GL_NEAREST);
- GL_REPORT_ERRORD();
}
void BeginTriangles()
@@ -247,7 +244,6 @@ namespace HwRasterizer
glDisableVertexAttribArray(col_atex);
glDisableVertexAttribArray(col_apos);
}
- GL_REPORT_ERRORD();
}
static void DrawTextureVertex(OutputVertexData *v0, OutputVertexData *v1, OutputVertexData *v2)
@@ -295,7 +291,6 @@ namespace HwRasterizer
glDisableVertexAttribArray(tex_atex);
glDisableVertexAttribArray(tex_apos);
}
- GL_REPORT_ERRORD();
}
void DrawTriangleFrontFace(OutputVertexData *v0, OutputVertexData *v1, OutputVertexData *v2)
@@ -332,7 +327,6 @@ namespace HwRasterizer
glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
glDisableVertexAttribArray(col_apos);
}
- GL_REPORT_ERRORD();
}
TexCacheEntry::TexCacheEntry()
@@ -358,8 +352,6 @@ namespace HwRasterizer
glGenTextures(1, (GLuint *)&texture);
glBindTexture(texType, texture);
glTexImage2D(texType, 0, GL_RGBA, (GLsizei)image_width, (GLsizei)image_height, 0, GL_RGBA, GL_UNSIGNED_BYTE, temp);
-
- GL_REPORT_ERRORD();
}
void TexCacheEntry::Destroy()
diff --git a/Source/Core/VideoBackends/Software/RasterFont.cpp b/Source/Core/VideoBackends/Software/RasterFont.cpp
index 8aefd89599..83e1165d48 100644
--- a/Source/Core/VideoBackends/Software/RasterFont.cpp
+++ b/Source/Core/VideoBackends/Software/RasterFont.cpp
@@ -148,14 +148,12 @@ void RasterFont::printString(const char *s, double x, double y, double z)
// go to the right spot
glRasterPos3d(x, y, z);
- GL_REPORT_ERRORD();
glPushAttrib (GL_LIST_BIT);
glListBase(fontOffset);
glCallLists((GLsizei)strlen(s2), GL_UNSIGNED_BYTE, (GLubyte *) s2);
- GL_REPORT_ERRORD();
+
glPopAttrib();
- GL_REPORT_ERRORD();
}
void RasterFont::printCenteredString(const char *s, double y, int screen_width, double z)
diff --git a/Source/Core/VideoBackends/Software/SWRenderer.cpp b/Source/Core/VideoBackends/Software/SWRenderer.cpp
index 3289736214..fab1db041f 100644
--- a/Source/Core/VideoBackends/Software/SWRenderer.cpp
+++ b/Source/Core/VideoBackends/Software/SWRenderer.cpp
@@ -103,7 +103,6 @@ void SWRenderer::Prepare()
s_pfont = new RasterFont();
glEnable(GL_TEXTURE_2D);
}
- GL_REPORT_ERRORD();
}
void SWRenderer::SetScreenshot(const char *_szFilename)
@@ -271,7 +270,6 @@ void SWRenderer::DrawTexture(u8 *texture, int width, int height)
glDisableVertexAttribArray(attr_tex);
glBindTexture(GL_TEXTURE_2D, 0);
- GL_REPORT_ERRORD();
}
void SWRenderer::SwapBuffer()
@@ -288,6 +286,4 @@ void SWRenderer::SwapBuffer()
swstats.ResetFrame();
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-
- GL_REPORT_ERRORD();
}