"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "layer0/os_gl.h" between
pymol-v2.1.0.tar.bz2 and pymol-open-source-2.2.0.tar.gz

About: PyMOL is a Python-enhanced molecular graphics tool. It excels at 3D visualization of proteins, small molecules, density, surfaces, and trajectories. It also includes molecular editing, ray tracing, and movies. Open Source version.

os_gl.h  (pymol-v2.1.0.tar.bz2)	:	os_gl.h  (pymol-open-source-2.2.0)
#ifndef _H_os_gl		#ifndef _H_os_gl
#define _H_os_gl		#define _H_os_gl
#include"os_predef.h"		#include"os_predef.h"
#include"os_proprietary.h"		#include"os_proprietary.h"
		// hardcode either true, or (x)
		#define ALWAYS_IMMEDIATE_OR(x) true
		#define _PYMOL_NO_AA_SHADERS
		#ifndef PURE_OPENGL_ES_2
#define _PYMOL_ARB_SHADERS		#define _PYMOL_ARB_SHADERS
		#endif
#define GL_LABEL_SCREEN_SHADER 0xfff0		#define GL_DEFAULT_SHADER_WITH_SETTINGS 0xffe0
		#define GL_SPHERE_SHADER 0xffe1
		#define GL_CYLINDER_SHADER 0xffe2
		#define GL_TWO_SIDED_LIGHTING 0xffe3
		#define GL_MESH_LIGHTING 0xffe4
		#define GL_DOT_LIGHTING 0xffe5
		#define GL_LABEL_FLOAT_TEXT 0xffe6
		#define GL_DASH_TRANSPARENCY_DEPTH_TEST 0xffe7
		#define GL_BACK_FACE_CULLING 0xffe8
		#define GL_DEPTH_TEST_IF_FLOATING 0xffe9
		// unused: 0xfff0, 0xfffc
#define GL_LABEL_SHADER 0xfffa		#define GL_LABEL_SHADER 0xfffa
#define GL_BACKGROUND_SHADER 0xfffb		#define GL_BACKGROUND_SHADER 0xfffb
#define GL_DEFAULT_SHADER_SCREEN 0xfffc
#define GL_DEFAULT_SHADER 0xfffd		#define GL_DEFAULT_SHADER 0xfffd
#define GL_SHADER_LIGHTING 0xfffe		#define GL_SHADER_LIGHTING 0xfffe
#define GL_SCREEN_SHADER 0xfff1		#define GL_SCREEN_SHADER 0xfff1
#define GL_RAMP_SHADER 0xfff2		#define GL_RAMP_SHADER 0xfff2
		#define GL_CONNECTOR_SHADER 0xfff3
		#define GL_FXAA_SHADER 0xfff4
		#define GL_SMAA1_SHADER 0xfff5
		#define GL_SMAA2_SHADER 0xfff6
		#define GL_SMAA3_SHADER 0xfff7
		#define GL_TRILINES_SHADER 0xfff8
		#define GL_OIT_SHADER 0xfff9
		#define GL_OIT_COPY_SHADER 0xffea
		#define GL_SURFACE_SHADER 0xffeb
		#define GL_LINE_SHADER 0xffec
		#define CGO_GL_LIGHTING 0xffef
		#ifndef _PYMOL_OSX
#ifndef WIN32		#ifndef WIN32
#define GL_GLEXT_PROTOTYPES		#define GL_GLEXT_PROTOTYPES
#endif		#endif
#ifndef GLEW_NO_GLU		#ifndef GLEW_NO_GLU
#define GLEW_NO_GLU		#define GLEW_NO_GLU
#endif		#endif
#include<GL/glew.h>		#include<GL/glew.h>
#ifndef _PYMOL_OSX
#include<GL/gl.h>		#include<GL/gl.h>
#include<GL/glext.h>		#include<GL/glext.h>
		#define GLDOUBLEMULTMATRIX glMultMatrixd
		#define GLDOUBLETRANSLATE glTranslated
#else		#else
#import <OpenGL/gl.h>
#import <OpenGL/glext.h>
#endif
		/* BEGIN PROPRIETARY CODE SEGMENT (see disclaimer in "os_proprietary.h") */
		#include<GL/glew.h>
		#include <OpenGL/gl.h>
		#include <OpenGL/glext.h>
#define GLDOUBLEMULTMATRIX glMultMatrixd		#define GLDOUBLEMULTMATRIX glMultMatrixd
#define GLDOUBLETRANSLATE glTranslated		#define GLDOUBLETRANSLATE glTranslated
		/* END PROPRIETARY CODE SEGMENT */
		#endif
#ifdef PURE_OPENGL_ES_2		#ifdef PURE_OPENGL_ES_2
#define GLLIGHTMODELI(arg1, arg2) /* nothing */		#define GLLIGHTMODELI(arg1, arg2) /* nothing */
#else		#else
#define GLLIGHTMODELI glLightModeli		#define GLLIGHTMODELI glLightModeli
#endif		#endif
void PyMOLReadPixels(GLint x,		void PyMOLReadPixels(GLint x,
GLint y,		GLint y,
GLsizei width,		GLsizei width,
GLsizei height, GLenum format, GLenum type, GLvoid * pixels );		GLsizei height, GLenum format, GLenum type, GLvoid * pixels );
skipping to change at line 98		skipping to change at line 135
#ifdef _PYMOL_NO_MAIN		#ifdef _PYMOL_NO_MAIN
#define _PYMOL_PRETEND_GLUT		#define _PYMOL_PRETEND_GLUT
#define _PYMOL_NO_GLUT		#define _PYMOL_NO_GLUT
#endif		#endif
#ifndef _PYMOL_PRETEND_GLUT		#ifndef _PYMOL_PRETEND_GLUT
/* ============ REAL GLUT BEING USED ============= */		/* ============ REAL GLUT BEING USED ============= */
		#include <stdlib.h>
#ifndef _PYMOL_OSX		#ifndef _PYMOL_OSX
#include<GL/glut.h>		#include<GL/glut.h>
#else		#else
#import <GLUT/glut.h>		#import <GLUT/glut.h>
#endif		#endif
#ifdef FREEGLUT		#ifdef FREEGLUT
#include<GL/freeglut_ext.h>		#include<GL/freeglut_ext.h>
#endif		#endif
skipping to change at line 125		skipping to change at line 164
#define P_GLUT_DISPLAY_MODE_POSSIBLE GLUT_DISPLAY_MODE_POSSIBLE		#define P_GLUT_DISPLAY_MODE_POSSIBLE GLUT_DISPLAY_MODE_POSSIBLE
#define P_GLUT_DOUBLE GLUT_DOUBLE		#define P_GLUT_DOUBLE GLUT_DOUBLE
#define P_GLUT_DOWN GLUT_DOWN		#define P_GLUT_DOWN GLUT_DOWN
#define P_GLUT_KEY_DOWN GLUT_KEY_DOWN		#define P_GLUT_KEY_DOWN GLUT_KEY_DOWN
#define P_GLUT_KEY_LEFT GLUT_KEY_LEFT		#define P_GLUT_KEY_LEFT GLUT_KEY_LEFT
#define P_GLUT_KEY_RIGHT GLUT_KEY_RIGHT		#define P_GLUT_KEY_RIGHT GLUT_KEY_RIGHT
#define P_GLUT_KEY_UP GLUT_KEY_UP		#define P_GLUT_KEY_UP GLUT_KEY_UP
#define P_GLUT_LEFT_BUTTON GLUT_LEFT_BUTTON		#define P_GLUT_LEFT_BUTTON GLUT_LEFT_BUTTON
#define P_GLUT_MIDDLE_BUTTON GLUT_MIDDLE_BUTTON		#define P_GLUT_MIDDLE_BUTTON GLUT_MIDDLE_BUTTON
#define P_GLUT_RGBA GLUT_RGBA		#define P_GLUT_RGBA GLUT_RGBA
		#define P_GLUT_ALPHA GLUT_ALPHA
#define P_GLUT_RIGHT_BUTTON GLUT_RIGHT_BUTTON		#define P_GLUT_RIGHT_BUTTON GLUT_RIGHT_BUTTON
#define P_GLUT_STEREO GLUT_STEREO		#define P_GLUT_STEREO GLUT_STEREO
#define P_GLUT_UP GLUT_UP		#define P_GLUT_UP GLUT_UP
#define P_GLUT_MULTISAMPLE GLUT_MULTISAMPLE		#define P_GLUT_MULTISAMPLE GLUT_MULTISAMPLE
#define P_GLUT_STENCIL GLUT_STENCIL		#define P_GLUT_STENCIL GLUT_STENCIL
#define P_GLUT_ACCUM GLUT_ACCUM		#define P_GLUT_ACCUM GLUT_ACCUM
#define P_GLUT_WINDOW_X GLUT_WINDOW_X		#define P_GLUT_WINDOW_X GLUT_WINDOW_X
#define P_GLUT_WINDOW_Y GLUT_WINDOW_Y		#define P_GLUT_WINDOW_Y GLUT_WINDOW_Y
#define P_GLUT_WINDOW_WIDTH GLUT_WINDOW_WIDTH		#define P_GLUT_WINDOW_WIDTH GLUT_WINDOW_WIDTH
skipping to change at line 310		skipping to change at line 350
#endif		#endif
#define GL_C_INT_TYPE uint		#define GL_C_INT_TYPE uint
#define GL_C_INT_ENUM GL_UNSIGNED_INT		#define GL_C_INT_ENUM GL_UNSIGNED_INT
#define SceneGLClearColor(red,green,blue,alpha) glClearColor(red,green,blue,alph a);		#define SceneGLClearColor(red,green,blue,alpha) glClearColor(red,green,blue,alph a);
#ifndef GL_FRAGMENT_PROGRAM_ARB		#ifndef GL_FRAGMENT_PROGRAM_ARB
#define GL_FRAGMENT_PROGRAM_ARB 0x8804		#define GL_FRAGMENT_PROGRAM_ARB 0x8804
#endif		#endif
		#ifndef GLAPIENTRY
		#define GLAPIENTRY
		#endif
		#define hasFrameBufferBinding() false
#endif		#endif
End of changes. 13 change blocks.
7 lines changed or deleted		53 lines changed or added

---