Remove windows.h inclusion from many headers

schrodinger · Aug 13, 2024 · 97a53fb · 97a53fb
1 parent edf1f43
commit 97a53fb
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 52 deletions.
diff --git a/contrib/vr/OpenVRControllerModel.cpp b/contrib/vr/OpenVRControllerModel.cpp
@@ -35,6 +35,7 @@ SOFTWARE.
 #include "OpenVRControllerModel.h"
 
 // system headers
+#include <chrono>
 #include <vector>
 #include "os_std.h"
 #include "os_gl.h"
@@ -186,14 +187,9 @@ void OpenVRControllerModel::Draw() {
 
 // Purpose:
 //-----------------------------------------------------------------------------
-static
-void ThreadSleep( unsigned long nMilliseconds )
+static void ThreadSleep(unsigned long nMilliseconds)
 {
-#if defined(_WIN32)
-  ::Sleep( nMilliseconds );
-#elif defined(POSIX)
-  usleep( nMilliseconds * 1000 );
-#endif
+  std::this_thread::sleep_for(std::chrono::milliseconds(nMilliseconds));
 }
 
 // Purpose: Finds a render model we've already loaded or loads a new one

diff --git a/layer0/ShaderMgr.cpp b/layer0/ShaderMgr.cpp
@@ -289,16 +289,6 @@ static void getGLSLVersion(PyMOLGlobals * G, int* major, int* minor);
 
 static void disableShaders(PyMOLGlobals * G);
 
-#ifdef WIN32
-/* REMOVE US */
-PFNGLTEXIMAGE3DPROC getTexImage3D(){
-  static PFNGLTEXIMAGE3DPROC my_glTexImage3D = nullptr;
-  if (!my_glTexImage3D)
-    my_glTexImage3D = (PFNGLTEXIMAGE3DPROC) wglGetProcAddress("glTexImage3D");
-  return my_glTexImage3D;
-}
-#endif
-
 /**
  * Use this to turn off shaders if the renderer cannot use them.
  */

diff --git a/layer0/ShaderMgr.h b/layer0/ShaderMgr.h
@@ -44,19 +44,6 @@ Z* -------------------------------------------------------------------
 #define LOCK_GUARD_MUTEX(name, var)
 #endif
 
-/* BEGIN PROPRIETARY CODE SEGMENT (see disclaimer in "os_proprietary.h") */
-#if 0
-PFNGLTEXIMAGE3DPROC getTexImage3D();
-static PFNGLTEXIMAGE3DPROC glTexImage3D;
-static PFNGLGENPROGRAMSARBPROC glGenProgramsARB;
-static PFNGLBINDPROGRAMARBPROC glBindProgramARB;
-static PFNGLDELETEPROGRAMSARBPROC glDeleteProgramsARB;
-static PFNGLPROGRAMSTRINGARBPROC glProgramStringARB;
-static PFNGLPROGRAMENVPARAMETER4FARBPROC glProgramEnvParameter4fARB;
-static PFNGLGETPROGRAMIVARBPROC glGetProgramivARB;
-#endif
-/* END PROPRIETARY CODE SEGMENT */
-
 class CShaderPrg {
 public:
   struct GeometryShaderParams

diff --git a/layer0/os_proprietary.h b/layer0/os_proprietary.h
@@ -69,14 +69,4 @@ Z* -------------------------------------------------------------------
  * CODE SEGMENTS.
  */
 
-
-/* BEGIN PROPRIETARY CODE SEGMENT */
-#ifdef WIN32
-#define NOMINMAX
-#include<windows.h>
-#endif
-
-
-/* END PROPRIETARY CODE SEGMENT */
-
 #endif
diff --git a/layer1/Setting.cpp b/layer1/Setting.cpp
@@ -48,6 +48,16 @@ Z* -------------------------------------------------------------------
 #include"OpenVRMode.h"
 #endif
 
+
+/* BEGIN PROPRIETARY CODE SEGMENT */
+#ifdef WIN32
+#define NOMINMAX
+#include<windows.h>
+#endif
+
+
+/* END PROPRIETARY CODE SEGMENT */
+
 /**
  * Setting level info table
  *

diff --git a/layer2/ObjectVolume.cpp b/layer2/ObjectVolume.cpp
@@ -836,18 +836,6 @@ void ObjectVolume::render(RenderInfo * info)
       int volume_bit_val = SettingGet_i(G, I->Setting.get(), nullptr, cSetting_volume_bit_depth);
       volume_bit_depth = (volume_bit_val < 17) ? tex::data_type::HALF_FLOAT : tex::data_type::FLOAT;
 
-/* BEGIN PROPRIETARY CODE SEGMENT (see disclaimer in "os_proprietary.h") */
-#if 0
-      glTexImage3D = getTexImage3D(); 
-      if (! glTexImage3D) {
-        PRINTFB(G, FB_ObjectVolume, FB_Errors)
-          " ObjectVolumeRender-Error: Could not bind the glActiveTexture or glTexImage3D function.\n"
-          ENDFB(G);
-        return;
-      } 
-#endif
-/* END PROPRIETARY CODE SEGMENT (see disclaimer in "os_proprietary.h") */
-
       if (vs->textures[0]) {
         G->ShaderMgr->freeGPUBuffer(vs->textures[0]);
         vs->textures[0] = 0;