← Back to branch summary

~ubuntu-branches/ubuntu/gutsy/vtk/gutsy

« back to all changes in this revision

Viewing changes to VolumeRendering/vtkOpenGLVolumeTextureMapper3D.cxx

  • Committer: Bazaar Package Importer
  • Author(s): Michele Angrisano
  • Date: 2007-06-30 22:39:48 UTC
  • mfrom: (1.1.5 upstream)
  • Revision ID: james.westby@ubuntu.com-20070630223948-6tn51upaurwfrcz8
Tags: 5.0.3-1ubuntu1
* Merge from Debian unstable, remaining changes:
  - Add export SHELL=/bin/bash in debian/rules.
  - Update maintainer in field debian/control.

Show diffs side-by-side

added added

removed removed

Lines of Context:
VolumeRendering/vtkOpenGLVolumeTextureMapper3D.cxx
40
40
extern const char* vtkVolumeTextureMapper3D_FourDependentNoShadeFP;
41
41
extern const char* vtkVolumeTextureMapper3D_FourDependentShadeFP;
42
42
 
 
43
// Apple OS X doesn't have glTexImage3DEXT, but it does have glTexImage3D
 
44
#if defined(__APPLE__) && defined(GL_VERSION_1_4)
 
45
#ifdef TexImage3DEXT
 
46
#undef TexImage3DEXT
 
47
#endif
 
48
#define TexImage3DEXT TexImage3D
 
49
#ifdef TEXTURE_3D_EXT
 
50
#undef TEXTURE_3D_EXT
 
51
#endif
 
52
#define TEXTURE_3D_EXT TEXTURE_3D
 
53
#endif /* defined(__APPLE__) && defined(GL_VERSION_1_4) */
 
54
 
43
55
//extern "C" void (*glXGetProcAddressARB(const GLubyte *procName))( void );
44
56
 
45
57
//#ifdef _WIN32
66
78
    }}
67
79
 
68
80
//#ifndef VTK_IMPLEMENT_MESA_CXX
69
 
vtkCxxRevisionMacro(vtkOpenGLVolumeTextureMapper3D, "$Revision: 1.7 $");
 
81
vtkCxxRevisionMacro(vtkOpenGLVolumeTextureMapper3D, "$Revision: 1.7.2.1 $");
70
82
vtkStandardNewMacro(vtkOpenGLVolumeTextureMapper3D);
71
83
//#endif
72
84
 
1745
1757
  vtkOpenGLExtensionManager * extensions = vtkOpenGLExtensionManager::New();
1746
1758
  extensions->SetRenderWindow(NULL); // set render window to current render window
1747
1759
  
1748
 
  
1749
1760
  int supports_GL_EXT_texture3D          = extensions->ExtensionSupported( "GL_EXT_texture3D" );
1750
1761
  int supports_GL_ARB_multitexture       = extensions->ExtensionSupported( "GL_ARB_multitexture" );
1751
1762
  int supports_GL_NV_texture_shader2     = extensions->ExtensionSupported( "GL_NV_texture_shader2" );
1797
1808
 
1798
1809
  extensions->Delete();
1799
1810
  
 
1811
#if defined(__APPLE__) && defined(GL_VERSION_1_4)
 
1812
  // Apple doesn't have glTexImage3D_EXT, but it does have
 
1813
  // OpenGL 1.4 which supports glTexImage3D directly
 
1814
  supports_GL_EXT_texture3D = 1;
 
1815
#endif
1800
1816
  
1801
1817
  int canDoFP = 0;
1802
1818
  int canDoNV = 0;