[Bf-blender-cvs] [7bf8ab3c494] blender2.8: Remove 4.1 pseudo-deprecated calls from gl-deprecated

Dalai Felinto noreply at git.blender.org
Tue Apr 18 12:09:46 CEST 2017


Commit: 7bf8ab3c494ee4e4e78cf846a3b7c07a472302e0
Author: Dalai Felinto
Date:   Tue Apr 18 12:09:29 2017 +0200
Branches: blender2.8
https://developer.blender.org/rB7bf8ab3c494ee4e4e78cf846a3b7c07a472302e0

Remove 4.1 pseudo-deprecated calls from gl-deprecated

First: we settle on core profile 3.3, not 4.1. Second, GL_CURRENT_PROGRAM still exists in 4.1 and 4.2. But it is recommented to use GL_ACTIVE_PROGRAM instead.

Following the logic of gl-deprecated.h we should define it to USE_GL_ACTIVE_PROGRAM instead. That said, removing it for now.

===================================================================

M	intern/glew-mx/intern/gl-deprecated.h

===================================================================

diff --git a/intern/glew-mx/intern/gl-deprecated.h b/intern/glew-mx/intern/gl-deprecated.h
index 1a23642fbfc..3f30a5776b3 100644
--- a/intern/glew-mx/intern/gl-deprecated.h
+++ b/intern/glew-mx/intern/gl-deprecated.h
@@ -865,8 +865,4 @@
 #undef GL_VERTEX_PROGRAM_POINT_SIZE
 #define GL_VERTEX_PROGRAM_POINT_SIZE USE_GL_PROGRAM_POINT_SIZE
 
-// Old Token Names 4.1
-#undef GL_CURRENT_PROGRAM
-#define GL_CURRENT_PROGRAM DO_NOT_USE_GL_CURRENT_PROGRAM
-
 #endif /* __GL_DEPRECATED_H__ */




More information about the Bf-blender-cvs mailing list