Changeset 3352 in vbox for trunk

Timestamp:

Jul 2, 2007 2:29:57 PM (18 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

22545

Message:

Link with opengl.lib

Location:

trunk/src/VBox/Additions/WINNT/Graphics/OpenGL/test

Files:

• Makefile.kmk (modified) (2 diffs)
• tstShOpenGL.cpp (modified) (2 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/OpenGL/test/Makefile.kmk

@@ -33 +33 @@
 tstShOpenGL_DEFS     = VBOX_HGCM
 tstShOpenGL_SOURCES  = tstShOpenGL.cpp
-tstShOpenGL_LIBS     = $(PATH_LIB)/VBoxOGL.lib
+tstShOpenGL_LIBS     = $(PATH_SDK_W2K3DDKX86_LIB)/opengl32.lib
 
 
@@ -39 +39 @@
 tstOGLSample_DEFS     = 
 tstOGLSample_SOURCES  = tstOGLSample.cpp
-tstOGLSample_LIBS     = $(PATH_LIB)/VBoxOGL.lib
+tstOGLSample_LIBS     = $(PATH_SDK_W2K3DDKX86_LIB)/opengl32.lib
 
-tstOGLSample_LIBS.win = \
-                       $(PATH_LIB)/VBoxOGL.lib
 ###        $(PATH_SDK_W2K3DDKX86_LIB)/opengl32.lib
 

trunk/src/VBox/Additions/WINNT/Graphics/OpenGL/test/tstShOpenGL.cpp

@@ -22 +22 @@
 #include <stdio.h>
 
+
+
+
+// Enable OpenGL
+
+void EnableOpenGL(HWND hWnd, HDC * hDC, HGLRC * hRC)
+{
+        PIXELFORMATDESCRIPTOR pfd;
+        int format;
+        
+        // get the device context (DC)
+        *hDC = GetDC( hWnd );
+        
+        // set the pixel format for the DC
+        ZeroMemory( &pfd, sizeof( pfd ) );
+        pfd.nSize = sizeof( pfd );
+        pfd.nVersion = 1;
+        pfd.dwFlags = PFD_DRAW_TO_WINDOW | PFD_SUPPORT_OPENGL | PFD_DOUBLEBUFFER;
+        pfd.iPixelType = PFD_TYPE_RGBA;
+        pfd.cColorBits = 24;
+        pfd.cDepthBits = 16;
+        pfd.iLayerType = PFD_MAIN_PLANE;
+        format = ChoosePixelFormat( *hDC, &pfd );
+        SetPixelFormat( *hDC, format, &pfd );
+        
+        // create and enable the render context (RC)
+        *hRC = wglCreateContext( *hDC );
+        wglMakeCurrent( *hDC, *hRC );
+        
+}
+
+// Disable OpenGL
+
+void DisableOpenGL(HWND hWnd, HDC hDC, HGLRC hRC)
+{
+        wglMakeCurrent( NULL, NULL );
+        wglDeleteContext( hRC );
+        ReleaseDC( hWnd, hDC );
+}
+
 int main(int argc, char **argv)
 {
+    HDC hdc;
+    HGLRC hglrc;
+
+    EnableOpenGL(0, &hdc, &hglrc);
+
     printf("GL_VENDOR       %s\n", glGetString(GL_VENDOR));
     printf("GL_RENDERER     %s\n", glGetString(GL_RENDERER));
@@ -29 +74 @@
     printf("GL_EXTENSIONS   %s\n", glGetString(GL_EXTENSIONS));
 
-    glEnable(GL_BLEND);
-    glFlush();
+    DisableOpenGL(0, hdc, hglrc);
     return 0;
 }
-