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

Timestamp:

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

Author:

vboxsync

Message:

crOpenGL: update to wine 1.1.26

File:

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

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

@@ -42 +42 @@
     IWineD3DVolumeTextureImpl *This = (IWineD3DVolumeTextureImpl *)iface;
     IWineD3DDeviceImpl *device = This->resource.wineD3DDevice;
-    const WineD3D_GL_Info *gl_info = &device->adapter->gl_info;
+    const struct wined3d_gl_info *gl_info = &device->adapter->gl_info;
     BOOL srgb_mode = This->baseTexture.is_srgb;
     BOOL srgb_was_toggled = FALSE;
@@ -109 +109 @@
         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 tmp_w, tmp_h, tmp_d;
@@ -172 +172 @@
 
     /* Is NP2 support for volumes needed? */
-    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;
 
     /* Generate all the surfaces. */
@@ -341 +341 @@
 }
 
+/* Context activation is done by the caller. */
 static HRESULT WINAPI IWineD3DVolumeTextureImpl_BindTexture(IWineD3DVolumeTexture *iface, BOOL srgb) {
     IWineD3DVolumeTextureImpl *This = (IWineD3DVolumeTextureImpl *)iface;