Changeset 69420 in vbox

Timestamp:

Oct 27, 2017 10:22:13 AM (7 years ago)

Author:

vboxsync

Message:

Graphics/shaderlib: scm updates

Location:

trunk/src/VBox/Devices/Graphics/shaderlib

Files:

• shaderapi.c (modified) (6 diffs)
• vboxext.h (modified) (1 diff)
• wine/vbox/VBoxDbgGl.c (modified) (1 diff)
• wine/vbox/VBoxDbgGl.h (modified) (1 diff)
• wine/vbox/VBoxWineEx.h (modified) (3 diffs)

trunk/src/VBox/Devices/Graphics/shaderlib/shaderapi.c

@@ -46 +46 @@
 #endif
 
-#undef GL_EXT_FUNCS_GEN 
+#undef GL_EXT_FUNCS_GEN
 #define GL_EXT_FUNCS_GEN \
     /* GL_ARB_shader_objects */ \
@@ -384 +384 @@
 
     object->lpVtbl->Release((IWineD3DVertexShader *)object);
-        return VINF_SUCCESS;
+        return VINF_SUCCESS;
 }
 
@@ -395 +395 @@
 
     object->lpVtbl->Release((IWineD3DPixelShader *)object);
-        return VINF_SUCCESS;
+        return VINF_SUCCESS;
 }
 
@@ -634 +634 @@
 
     Log(("ShaderSetPositionTransformed viewport (%d,%d) fPreTransformed=%d\n", cxViewPort, cyViewPort, fPreTransformed));
-    
+
     if (fPreTransformed)
     {   /* In the pre-transformed vertex coordinate case we need to disable all transformations as we're already using screen coordinates. */
@@ -673 +673 @@
     pThis->rtHeight = rtHeight;
 
-    /* @todo missing state:
+    /** @todo missing state:
      * - fog enable (stateblock->renderState[WINED3DRS_FOGENABLE])
      * - fog mode (stateblock->renderState[WINED3DRS_FOGTABLEMODE])
@@ -749 +749 @@
     glTranslatef(xoffset, -yoffset, -1.0f);
 
-    if (fPretransformed) 
+    if (fPretransformed)
     {
         /* One world coordinate equals one screen pixel; y-inversion no longer an issue */

trunk/src/VBox/Devices/Graphics/shaderlib/vboxext.h

@@ -5 +5 @@
 
 /*
- *
  * Copyright (C) 2011-2016 Oracle Corporation
  *

trunk/src/VBox/Devices/Graphics/shaderlib/wine/vbox/VBoxDbgGl.c

@@ -1 +1 @@
 /* $Id$ */
-
 /** @file
  * VBox wine & ogl debugging stuff

trunk/src/VBox/Devices/Graphics/shaderlib/wine/vbox/VBoxDbgGl.h

@@ -1 +1 @@
 /* $Id$ */
-
 /** @file
  * VBox wine & ogl debugging stuff

trunk/src/VBox/Devices/Graphics/shaderlib/wine/vbox/VBoxWineEx.h

@@ +1 @@
+/* $Id$ */
 /** @file
- *
  * VBox extension to Wine D3D
- *
+ */
+
+/*
  * Copyright (C) 2010-2016 Oracle Corporation
  *
@@ -13 +15 @@
  * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
  */
+
 #ifndef ___VBoxWineEx_h__
 #define ___VBoxWineEx_h__
@@ -43 +46 @@
 
 typedef VBOXWINEEX_DECL(HRESULT) FNVBOXWINEEXD3DDEV9_CREATECUBETEXTURE(IDirect3DDevice9Ex *iface,
-            UINT edge_length, UINT levels, DWORD usage, D3DFORMAT format, 
+            UINT edge_length, UINT levels, DWORD usage, D3DFORMAT format,
             D3DPOOL pool, IDirect3DCubeTexture9 **texture, HANDLE *shared_handle,
             void **pavClientMem);