diff options
| author | Maxime Curioni <maxime.curioni@gmail.com> | 2008-09-28 22:18:30 +0400 |
|---|---|---|
| committer | Maxime Curioni <maxime.curioni@gmail.com> | 2008-09-28 22:18:30 +0400 |
| commit | 5812c494a59d0bb6614bc4c332073e5c6773887d (patch) | |
| tree | b1fa99f2f43231279bf8d0ca0a5ce958b7f709d8 /source/blender/freestyle/intern/rendering | |
| parent | 26709ce90c09f784c78978fc54930dc0d9e76ca3 (diff) | |
soc-2008-mxcurioni: imposed the glBlendEquation test accross all platforms (providing greater robustness), introduced the FRS_glBlendEquation that uses glBlendEquation/glBlendEquationEXT based on the system's capabilities.
Diffstat (limited to 'source/blender/freestyle/intern/rendering')
| -rwxr-xr-x | source/blender/freestyle/intern/rendering/GLStrokeRenderer.cpp | 8 | ||||
| -rwxr-xr-x | source/blender/freestyle/intern/rendering/GLStrokeRenderer.h | 11 |
2 files changed, 4 insertions, 15 deletions
diff --git a/source/blender/freestyle/intern/rendering/GLStrokeRenderer.cpp b/source/blender/freestyle/intern/rendering/GLStrokeRenderer.cpp index e0189da7075..0213b5450ab 100755 --- a/source/blender/freestyle/intern/rendering/GLStrokeRenderer.cpp +++ b/source/blender/freestyle/intern/rendering/GLStrokeRenderer.cpp @@ -36,8 +36,6 @@ extern "C" { #include "../system/StringUtils.h" -//#define glBlendEquation(x) - GLStrokeRenderer::GLStrokeRenderer() :StrokeRenderer() { @@ -95,16 +93,16 @@ void GLStrokeRenderer::RenderStrokeRep(StrokeRep *iStrokeRep) const if(strokeType==Stroke::DRY_MEDIUM) { - glBlendEquation(GL_MAX); + FRS_glBlendEquation(GL_MAX); } else if(strokeType==Stroke::OPAQUE_MEDIUM) { - glBlendEquation(GL_ADD); + FRS_glBlendEquation(GL_ADD); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); } else { - glBlendEquation(GL_ADD); + FRS_glBlendEquation(GL_ADD); glBlendFunc(GL_SRC_ALPHA, GL_ONE); } glEnable(GL_TEXTURE_2D); diff --git a/source/blender/freestyle/intern/rendering/GLStrokeRenderer.h b/source/blender/freestyle/intern/rendering/GLStrokeRenderer.h index d7435ae5e47..345a4273350 100755 --- a/source/blender/freestyle/intern/rendering/GLStrokeRenderer.h +++ b/source/blender/freestyle/intern/rendering/GLStrokeRenderer.h @@ -34,16 +34,7 @@ # include "../stroke/StrokeRenderer.h" # include "../stroke/StrokeRep.h" - -#ifdef WIN32 -# include <GL/glew.h> -# include <windows.h> -#endif -#ifdef __MACH__ -# include <OpenGL/gl.h> -#else -# include <GL/gl.h> -#endif +#include "GLBlendEquation.h" /**********************************/ /* */ |