Changeset 21731 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/cubetexture.c

Timestamp:

Jul 21, 2009 9:16:52 AM (16 years ago)

Author:

vboxsync

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

50306

Message:

crOpenGL: update to wine 1.1.26

File:

• trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/cubetexture.c (modified) (4 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/cubetexture.c

@@ -150 +150 @@
         IWineD3DDeviceImpl *device, DWORD usage, WINED3DFORMAT format, WINED3DPOOL pool, IUnknown *parent)
 {
-    const WineD3D_GL_Info *gl_info = &device->adapter->gl_info;
+    const struct wined3d_gl_info *gl_info = &device->adapter->gl_info;
     const struct GlPixelFormatDesc *format_desc = getFormatDescEntry(format, gl_info);
     UINT pow2_edge_length;
@@ -220 +220 @@
     {
         /* Precalculated scaling for 'faked' non power of two texture coords. */
-        texture->baseTexture.pow2Matrix[0] = 1.0;
-        texture->baseTexture.pow2Matrix[5] = 1.0;
-        texture->baseTexture.pow2Matrix[10] = 1.0;
-        texture->baseTexture.pow2Matrix[15] = 1.0;
+        texture->baseTexture.pow2Matrix[0] = 1.0f;
+        texture->baseTexture.pow2Matrix[5] = 1.0f;
+        texture->baseTexture.pow2Matrix[10] = 1.0f;
+        texture->baseTexture.pow2Matrix[15] = 1.0f;
     }
     else
@@ -231 +231 @@
         texture->baseTexture.pow2Matrix[5] = ((float)edge_length) / ((float)pow2_edge_length);
         texture->baseTexture.pow2Matrix[10] = ((float)edge_length) / ((float)pow2_edge_length);
-        texture->baseTexture.pow2Matrix[15] = 1.0;
+        texture->baseTexture.pow2Matrix[15] = 1.0f;
         texture->baseTexture.pow2Matrix_identity = FALSE;
     }
@@ -411 +411 @@
 }
 
+/* Context activation is done by the caller. */
 static HRESULT WINAPI IWineD3DCubeTextureImpl_BindTexture(IWineD3DCubeTexture *iface, BOOL srgb) {
     IWineD3DCubeTextureImpl *This = (IWineD3DCubeTextureImpl *)iface;