Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of git://github.com/openscenegraph/osg into ios…

…-cmake-universal-build-script
  • Loading branch information...
commit 0a19259c295698fde5d51df643a7d5fb40a01f66 2 parents 9406e7f + 9e3645b
@stmh authored
View
3  src/osg/Texture.cpp
@@ -2478,6 +2478,7 @@ Texture::Extensions::Extensions(unsigned int contextID)
std::string rendererString(renderer ? renderer : "");
bool radeonHardwareDetected = (rendererString.find("Radeon")!=std::string::npos || rendererString.find("RADEON")!=std::string::npos);
+ bool fireGLHardwareDetected = (rendererString.find("FireGL")!=std::string::npos || rendererString.find("FIREGL")!=std::string::npos);
bool builtInSupport = OSG_GLES2_FEATURES || OSG_GL3_FEATURES;
@@ -2516,7 +2517,7 @@ Texture::Extensions::Extensions(unsigned int contextID)
_isGenerateMipMapSupported = builtInSupport || isGLExtensionOrVersionSupported(contextID,"GL_SGIS_generate_mipmap", 1.4f);
- _preferGenerateMipmapSGISForPowerOfTwo = radeonHardwareDetected ? false : true;
+ _preferGenerateMipmapSGISForPowerOfTwo = (radeonHardwareDetected||fireGLHardwareDetected) ? false : true;
_isTextureMultisampledSupported = isGLExtensionSupported(contextID,"GL_ARB_texture_multisample");
View
2  src/osgPresentation/SlideShowConstructor.cpp
@@ -1089,7 +1089,7 @@ void SlideShowConstructor::addImage(const std::string& filename, const PositionD
bool usedTextureRectangle = false;
- osg::Geometry* pictureQuad = createTexturedQuadGeometry(image_pos, positionData.rotate, image_width, image_height, image, usedTextureRectangle);
+ osg::Geometry* pictureQuad = createTexturedQuadGeometry(image_pos, positionData.rotate, image_width, image_height, image.get(), usedTextureRectangle);
osg::StateSet* pictureStateSet = pictureQuad->getOrCreateStateSet();
attachTexMat(pictureStateSet, imageData, s, t, usedTextureRectangle);
Please sign in to comment.
Something went wrong with that request. Please try again.