Commit 5c07dda7 authored by Martin Schultz's avatar Martin Schultz
Browse files

fixed a problem with defines for AntiAliasing samplers, due to including gl3.h

parent 0c906085
......@@ -58,8 +58,8 @@
//== INCLUDES =================================================================
#include <ACG/GL/acg_glew.hh>
#include <ACG/GL/AntiAliasing.hh>
#include <ACG/GL/acg_glew.hh>
#include <ACG/ShaderUtils/GLSLShader.hh>
#include <ACG/GL/ScreenQuad.hh>
......@@ -82,7 +82,7 @@ namespace ACG {
//== CLASS IMPLEMENTATION =====================================================
#ifdef GL_ARB_texture_multisample
#ifdef MSFILTERWEIGHTS
MSFilterWeights::MSFilterWeights(int _numSamples) : numSamples_(_numSamples) {
......@@ -133,12 +133,12 @@ void MSFilterWeights::asTextureBuffer( TextureBuffer& out ) {
//=============================================================================
#endif //MSFILTERWEIGHTS
//=============================================================================
#ifdef MSTEXTURESAMPLER
MSTextureSampler::MSTextureSampler() : shaderNearest_(0), shaderNearestDepth_(0), shaderLinear_(0) {
}
......@@ -286,7 +286,7 @@ void MSTextureSampler::filterMSAATexture_Linear( GLuint _texture, int _samples,
#endif // GL_ARB_texture_multisample
#endif // MSTEXTURESAMPLER
} // namespace ACG
......
......@@ -105,8 +105,8 @@ Recommended resources on implementing MSAA with render to texture:
http://www.humus.name/index.php?page=3D&ID=81
*/
#ifdef GL_ARB_texture_multisample
#define MSFILTERWEIGHTS
class ACGDLLEXPORT MSFilterWeights
{
......@@ -149,8 +149,8 @@ private:
// This class performs multisampling on MSAA textures and writes the result to the currently bound FBO.
#ifdef GL_ARB_texture_multisample
#define MSTEXTURESAMPLER
class ACGDLLEXPORT MSTextureSampler
{
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment