c770d3f573
wined3d: Mark the map binding up to date in texture2d_sub_resource_add_dirty_region.
2014-01-10 17:56:41 +01:00
4710c4b51a
wined3d: Store color keys in textures instead of in surfaces.
2014-01-09 15:50:39 +01:00
36dbac6cb8
wined3d: Set the volume container in volume_init().
2013-12-06 13:14:52 +01:00
5db26f7b45
wined3d: Pass a wined3d_resource_desc structure to volume_init().
2013-12-06 13:14:52 +01:00
15c1a26b55
wined3d: Create volumes inside wined3d.
2013-12-06 13:14:52 +01:00
4b3db52b53
wined3d: Merge the texture creation functions.
2013-11-27 11:30:15 +01:00
4122cd8083
wined3d: Get rid of surface_set_dirty().
2013-11-25 15:15:54 +01:00
f6b5dc246a
wined3d: Get rid of the WINED3DSRGB enum.
2013-11-22 11:37:29 +01:00
e0beab8b81
wined3d: Merge texture2d_preload() and texture3d_preload() into wined3d_texture_load().
2013-11-22 11:37:20 +01:00
0d7b12696d
wined3d: Merge texture2d_unload() and texture3d_unload().
2013-11-21 13:36:37 +01:00
f91eab6d3e
wined3d: Merge surface_bind_and_dirtify() and volume_bind_and_dirtify() into wined3d_texture_bind_and_dirtify().
2013-11-21 13:36:35 +01:00
2ca86bcab6
wined3d: Return early in wined3d_texture_bind() if the GL texture already has a name.
2013-11-21 13:36:31 +01:00
6b90248aec
wined3d: Merge texture2d_bind() and texture3d_bind() into wined3d_texture_bind().
2013-11-21 13:36:29 +01:00
0ff0a6e9bc
wined3d: Remove surface->dirtyRect.
2013-11-20 16:54:39 +01:00
7e72985358
wined3d: wined3d_texture_bind() should never fail.
2013-11-20 11:28:23 +01:00
7e8897b7b8
wined3d: Get rid of the redundant texture_name and texture_name_srgb fields in struct wined3d_surface.
2013-11-20 11:28:22 +01:00
42f6ca821c
wined3d: Set the surface container in surface_init().
2013-11-15 12:00:32 +01:00
bb00811d60
wined3d: Pass a wined3d_resource_desc structure to surface_init().
2013-11-15 12:00:30 +01:00
afc3d2ab70
wined3d: Create surfaces inside wined3d.
2013-11-15 12:00:26 +01:00
86d63f1d5a
wined3d: Move sRGB_decode handling to the top of texture_bind / preload.
2013-10-09 15:52:37 +02:00
16f7c24296
wined3d: Take sRGB_decode into account in texture_srgb_mode.
2013-10-09 15:52:22 +02:00
fe44be5fde
wined3d: Pass the context to the internal texture_preload function.
2013-09-16 13:05:52 +02:00
59e2f52ff8
wined3d: Replace the "dirty" field in struct gl_texture with WINED3D_TEXTURE_ flags.
2013-09-09 22:09:58 +02:00
c44012f0c1
wined3d: Get rid of the "dirty" flag to wined3d_texture_set_dirty().
2013-09-09 22:09:57 +02:00
df5a0976e9
wined3d: Check the format block size before creating textures.
...
Sizes of textures and stand-alone surfaces must be multiples of the
format's block size for DXTN formats. Since we create a texture for
everything (except in ddraw), this check also takes care of stand-alone
surfaces.
2013-09-06 17:25:08 +02:00
b5e0c5d052
wined3d: Get rid of some leftover comments referring to the GL lock.
2013-09-02 18:02:26 +02:00
f5f7a4e457
wined3d: Get rid of GL_EXT_paletted_texture support.
...
No current drivers support this, and it's probably broken. Also note that
since we removed paletted texture support from wined3d, this would only be
used for WINED3DFMT_P8_UINT blits.
2013-08-28 11:17:09 +02:00
6bc3cbf1c5
wined3d: Implement sRGB for volumes.
2013-08-26 19:02:16 +02:00
07079d1109
wined3d: Remove locked and dirty boxes from volumes.
2013-08-22 20:15:39 +02:00
ac871305f8
wined3d: Store the mipmap level in the volume.
2013-08-22 20:15:18 +02:00
d6bc4fe71a
wined3d: Allow surface flags to be passed to texture creation functions.
2013-06-06 11:47:19 +02:00
91096dd7ad
wined3d: Pass a wined3d_resource_desc structure to wined3d_texture_create_3d().
2013-06-06 11:47:07 +02:00
b23739316c
wined3d: Pass a wined3d_resource_desc structure to wined3d_texture_create_cube().
2013-06-05 17:31:39 +02:00
9d4cbd6195
wined3d: Pass a wined3d_resource_desc structure to wined3d_texture_create_2d().
2013-06-05 17:31:39 +02:00
1366e3a5bf
wined3d: Pass a wined3d_resource_desc structure to wined3d_texture_init().
2013-06-05 17:31:39 +02:00
a4d2660c9b
wined3d: Pass a wined3d_resource_desc structure to device_parent_create_texture_surface().
2013-06-04 10:14:26 +02:00
1276a3db04
wined3d: Properly set resource dimensions in wined3d_texture_init().
2013-06-04 10:14:24 +02:00
a3f59cf618
wined3d: Allow textures as swapchain surfaces.
2013-06-03 11:30:43 +02:00
c6ed62735d
wined3d: Refuse to create NPOT textures without GL support.
2013-04-16 17:48:20 +02:00
196c88cfc4
wined3d: 1x1 texures have a power of two size.
2013-04-15 17:45:44 +02:00
50a9fb579c
wined3d: Remove ERR() on HeapAlloc failure for small sizes known at compile time.
2013-02-06 09:04:41 +01:00
78984cf46c
wined3d: Get rid of ENTER_GL / LEAVE_GL.
2012-12-11 12:03:39 +01:00
2bf46c60fb
wined3d: Replace the face and level parameters to device_parent_create_texture_surface() with the sub-resource index.
2012-10-25 11:48:25 +02:00
ddbe791d37
wined3d: Set texture_level in surface_set_texture_target() as well.
2012-10-24 11:24:22 +02:00
894d161891
wined3d: Call core GL functions through gl_info.gl_ops as well.
2012-07-25 20:10:08 +02:00
0821c8024b
wined3d: Merge the device parent create_rendertarget() and create_depth_stencil() handlers.
2012-07-11 09:57:07 -05:00
19ba80e7c2
wined3d: We must include Wine's port.h before using NAN.
2012-06-01 17:41:52 +02:00
de43de510a
wined3d: Move the resource bind_count field up to wined3d_resource.
2012-04-26 19:26:14 +02:00
e53a277305
wined3d: Get rid of the WINED3DPOOL typedef.
2012-01-18 12:37:38 +01:00
6a5a098b23
wined3d: Get rid of the WINED3DRESOURCETYPE typedef.
2012-01-18 12:37:38 +01:00
e70990041b
wined3d: Get rid of the WINED3DTEXTUREFILTERTYPE typedef.
2012-01-13 17:34:31 +01:00
2650ba4b17
wined3d: Get rid of the WINED3DTEXTUREADDRESS typedef.
2012-01-11 17:47:23 +01:00
9a8491045e
wined3d: Get rid of the WINED3DMULTISAMPLE_TYPE typedef.
2012-01-09 12:22:17 +01:00
08545dc739
wined3d: Get rid of the WINED3DSAMPLERSTATETYPE typedef.
2012-01-09 12:22:12 +01:00
5c5216e609
wined3d: Get rid of the WINED3DBOX typedef.
2011-12-07 17:49:56 +01:00
1ac60004dc
wined3d: Update sRGB GL texture state.
2011-11-23 09:13:21 +01:00
496b438ede
wined3d: Remove d3d8/9 palette support.
2011-10-11 13:37:49 +02:00
0386b44bad
wined3d: Keep track of the current texture type for each texture unit.
2011-08-29 12:08:19 +02:00
e53ae83d74
wined3d: Pass around the context instead of gl_info.
2011-08-25 11:31:55 +02:00
be8ea9c36e
wined3d: Make context_acquire() unconditional in a bunch of places.
2011-08-25 11:31:55 +02:00
2e14d9ac0e
wined3d: Make the texture parameter to texture_srgb_mode() const.
2011-07-15 10:08:18 +02:00
792060d67f
d3d8: Implement IDirect3DVolumeTexture8 private data handling on top of wined3d_resource.
2011-06-20 11:28:40 +02:00
732338ab35
d3d9: Implement IDirect3DCubeTexture9 private data handling on top of wined3d_resource.
2011-06-20 11:28:22 +02:00
469eba24c0
d3d9: Implement IDirect3DVertexBuffer9 private data handling on top of wined3d_resource.
2011-06-17 11:02:28 +02:00
1fbdfd625a
wined3d: Get rid of wined3d_texture_get_type().
2011-06-07 14:18:34 +02:00
c8f26a1345
wined3d: Rename IWineD3DDeviceImpl_MarkStateDirty() to device_invalidate_state().
2011-06-06 16:18:41 +02:00
0143fa7382
wined3d: Use the requested sRGB mode in texture3d_preload().
2011-05-19 10:08:05 +02:00
6d6402afef
wined3d: Get rid of the mostly unused SRGB_BOTH enum value.
2011-05-19 10:08:02 +02:00
3032b40c80
wined3d: Get rid of the IWineD3DDeviceParent interface.
2011-05-19 10:06:21 +02:00
0e0e5c3e38
wined3d: Get rid of the IWineD3DDevice typedefs.
2011-05-17 10:06:23 +02:00
00a5f38595
wined3d: Remove object creation methods from the IWineD3DDevice interface.
2011-05-11 14:56:48 +02:00
c4b73c4550
wined3d: Get rid of the IWineD3DSurface typedefs.
2011-04-29 16:52:13 +02:00
1c1de920e3
wined3d: Remove COM from the surface implementation.
2011-04-29 16:52:13 +02:00
f6e4f4a122
wined3d: Get rid of the mipmap hint code.
...
Mipmap hint isn't a texture parameter, but a global hint. This never worked,
it just causes GL errors.
2011-04-21 16:53:41 +02:00
89a4e696a2
wined3d: Get rid of the IWineD3DVolume typedefs.
2011-04-15 10:07:58 +02:00
2c450571e5
wined3d: Remove COM from the volume implementation.
2011-04-15 10:07:57 +02:00
19e66a0dc9
wined3d: Replace "is_srgb" in wined3d_texture with a flag.
2011-03-29 12:34:54 +02:00
0e22aea01e
wined3d: Replace "pow2_matrix_identity" in wined3d_texture with a flag.
2011-03-29 12:34:49 +02:00
e111acdf11
wined3d: Replace "cond_np2" in wined3d_texture with a flag.
2011-03-29 12:34:44 +02:00
c5bf96c951
wined3d: Get rid of IWineD3DBaseTextureClass.
2011-03-29 12:34:40 +02:00
fd8e18bd2b
wined3d: Remove COM from the texture implementation.
2011-03-28 17:08:52 +02:00
87087f379f
wined3d: Merge the texture implementations.
2011-03-28 17:08:52 +02:00
85f2348549
wined3d: Get rid of the IWineD3DBase requirement for surface_set_container().
...
This made sense back when we needed the container's parent and didn't know the
container's type, but neither of those is true anymore.
2011-03-28 17:08:52 +02:00
96a8417a21
wined3d: Merge the texture cleanup functions.
2011-03-18 15:59:05 +01:00
d30d9d5e49
wined3d: Merge the IWineD3DBaseTexture::AddDirtyRegion() implementations.
2011-03-18 15:59:04 +01:00
09b4ed2e75
wined3d: Get rid of IWineD3DBaseTexture::IsCondNP2().
2011-03-17 10:41:54 +01:00
2d4bce87ba
wined3d: Get rid of IWineD3DTextureImpl.
2011-03-17 10:41:41 +01:00
f1ec3820d7
wined3d: Get rid of IWineD3DTexture.
2011-03-17 10:40:52 +01:00
4a10bbc76d
wined3d: Generalize AddDirtyRect() / AddDirtyBox() to AddDirtyRegion().
2011-03-15 17:14:07 +01:00
13b05b9dbe
wined3d: Get rid of IWineD3DTexture::Unmap().
2011-03-14 12:39:27 +01:00
b77a661515
wined3d: Get rid of IWineD3DTexture::Map().
2011-03-14 12:39:27 +01:00
4fd03150f6
wined3d: Get rid of IWineD3DBaseTexture::GetSubResourceDesc().
2011-03-10 12:53:13 +01:00
8809ebdf79
wined3d: Generalize GetSurfaceLevel() / GetVolumeLevel() to GetSubResource().
2011-03-10 12:53:04 +01:00
4be256a47c
wined3d: Introduce wined3d_resource_get_desc() to retrieve the resource desc.
2011-03-10 12:52:58 +01:00
63b72d789d
wined3d: Move the GetLevelDesc() functions to the IWineD3DBaseTexture interface.
2011-03-09 12:29:04 +01:00
756fdb7c5a
wined3d: Merge the various resource desc structures.
2011-03-09 12:28:58 +01:00
9059271442
wined3d: Check subresources for NULL during texture cleanup.
...
This fixes a regression introduced by
1de6adfbae
2011-03-07 11:10:01 +01:00
af0a4b6956
wined3d: Pass gl_info to basetexture_bind().
2011-03-03 17:47:14 +01:00
75c8e9f7b4
wined3d: Use EXT_texture_sRGB_decode to avoid sRGB texture duplication.
2011-03-03 17:47:13 +01:00
09c3537ad0
wined3d: Retrieve the GL texture through a function.
2011-03-03 17:47:13 +01:00
fe425a2f23
wined3d: Use basetexture_set_dirty() in some more places.
2011-03-02 12:50:59 +01:00
1de6adfbae
wined3d: Make IWineD3DResourceImpl an independent structure.
2011-03-01 13:21:59 +01:00
39497ff4d1
wined3d: Remove IWineD3DResource::UnLoad() from the public interface.
2011-02-28 11:09:48 +01:00
0b7fef751e
wined3d: Remove IWineD3DSurface::LoadTexture() from the public interface.
2011-01-21 18:37:06 +01:00
c117248bd1
wined3d: Pass an IWineD3DResourceImpl pointer to resource_get_type().
2011-01-07 10:23:37 +01:00
7e67bcedfd
wined3d: Pass an IWineD3DResourceImpl pointer to resource_set_priority().
2011-01-07 10:23:25 +01:00
2d9748b1e3
wined3d: Pass an IWineD3DResourceImpl pointer to resource_get_priority().
2011-01-07 10:23:21 +01:00
a80749fd57
wined3d: Pass an IWineD3DResourceImpl pointer to resource_set_private_data().
2011-01-07 10:23:17 +01:00
92e439b0f0
wined3d: Pass an IWineD3DResourceImpl pointer to resource_get_private_data().
2011-01-06 11:33:33 +01:00
a97ae0db6a
wined3d: Pass an IWineD3DResourceImpl pointer to resource_free_private_data().
2011-01-06 11:33:29 +01:00
d72520b5cc
wined3d: Remove IWineD3DBaseTexture::BindTexture() from the public interface.
2011-01-05 17:22:01 +01:00
3a59137b09
wined3d: Pass an IWineD3DBaseTextureImpl pointer to internal_preload().
2011-01-04 11:09:52 +01:00
32779a2232
wined3d: Pass an IWineD3DBaseTextureImpl pointer to basetexture_bind().
2011-01-04 11:09:47 +01:00
bf108ac872
wined3d: Pass an IWineD3DBaseTextureImpl pointer to basetexture_generate_mipmaps().
2011-01-04 11:09:45 +01:00
9de4433dbe
wined3d: Pass an IWineD3DBaseTextureImpl pointer to basetexture_get_autogen_filter_type().
2011-01-03 11:54:05 +01:00
568f9ecb22
wined3d: Pass an IWineD3DBaseTextureImpl pointer to basetexture_set_autogen_filter_type().
2011-01-03 11:54:04 +01:00
54e1aeeb62
wined3d: Pass an IWineD3DBaseTextureImpl pointer to basetexture_get_lod().
2011-01-03 11:54:04 +01:00
482a5fd030
wined3d: Pass an IWineD3DBaseTextureImpl pointer to basetexture_set_lod().
2011-01-03 11:54:04 +01:00
f5d96d1701
wined3d: Pass an IWineD3DBaseTextureImpl pointer to basetexture_get_level_count().
2010-12-16 11:50:09 +01:00
2438968c34
wined3d: Pass an IWineD3DBaseTextureImpl pointer to basetexture_cleanup().
2010-12-16 11:50:09 +01:00
47fcc00cce
wined3d: Pass an IWineD3DBaseTextureImpl pointer to basetexture_unload().
2010-12-16 11:50:09 +01:00
a3b2407824
wined3d: Remove IWineD3DBaseTexture::SetDirty() from the public interface.
2010-12-09 12:14:19 +01:00
4dd3066ea3
wined3d: Remove the unused IWineD3DBaseTexture::GetDirty() method.
2010-12-09 12:14:11 +01:00
03f7a2d88e
wined3d: Get rid of the remaining "Flags".
2010-11-23 13:15:36 +01:00
b459b917fb
wined3d: Textures never have a resource size.
...
They're just containers for their subresources.
2010-11-23 13:15:32 +01:00
efb185dcd5
wined3d: Rename the wined3d_format "Flags" field to "flags".
2010-11-12 15:43:08 +01:00
6dd9109358
wined3d: Pass a sub-resource index instead of a face + miplevel to cube texture methods.
2010-10-25 14:29:31 +02:00
f0a0714ecd
wined3d: Pass a sub-resource index instead of a miplevel to 2D texture methods.
2010-10-25 14:29:21 +02:00
95469309d6
wined3d: Consistently use Map/Unmap for mapping resources.
2010-10-14 17:54:52 +02:00
5a3a4ac77a
wined3d: Remove IWineD3DBaseTexture::GetTextureDimensions() from the public wined3d interface.
2010-09-18 13:05:44 +02:00
2e119ecd28
wined3d: Move the texture's target field to the base texture struct.
2010-09-18 13:05:36 +02:00
53183b4cf3
wined3d: IWineD3DSurface_GetDesc() should never fail.
2010-09-08 13:31:43 +02:00
bc2db78c3a
wined3d: Explicitly document some more consequences of GL locking policy.
...
The basic rule is that you can't call anything that takes the user32 / gdi32
lock while under the GL (winex11) lock. As a consequence, you can't call
anything like context_acquire() or context_destroy() either.
2010-09-03 11:05:10 +02:00
6c4c351791
wined3d: Don't require wined3d object parents to be COM objects.
2010-09-01 14:01:02 +02:00
3a7f08a56f
wined3d: Rename wined3d_format_desc to wined3d_format.
2010-08-31 14:23:47 +02:00
b233e7b301
wined3d: Rename the "format" field in wined3d_format_desc to "id".
2010-08-26 12:41:44 +02:00
cc5271d1b7
wined3d: Rename WINED3DFORMAT to wined3d_format_id.
2010-08-24 12:25:01 +02:00
0b24db5db5
wined3d: Also store the subresource container type.
2010-08-17 11:55:32 +02:00
61db577a4b
wined3d: Remove SetContainer() from the public IWineD3DSurface interface.
2010-08-17 11:55:32 +02:00
f7760656f3
wined3d: Remove LoadLocation() from the public wined3d surface interface.
2010-07-22 10:13:24 +02:00
147f24dd78
wined3d: Remove ModifyLocation() from the public wined3d surface interface.
2010-07-22 10:13:13 +02:00
c411b45da9
wined3d: Use a more consistent name for the normalized texrect "extension".
2010-07-21 09:33:18 +02:00
49e076eabd
wined3d: Separate context acquisition and state application.
2010-05-04 13:14:59 +02:00
42375518ba
wined3d: Simply pass an IWineD3DSurfaceImpl pointer to surface_add_dirty_rect().
2010-04-27 12:02:39 -05:00
f78d85ffe1
wined3d: Simply pass an IWineD3DSurfaceImpl pointer to surface_set_texture_target().
2010-04-27 12:02:31 -05:00
294d9dae8f
wined3d: Simply pass an IWineD3DSurfaceImpl pointer to surface_set_texture_name().
2010-04-27 12:02:24 -05:00
339f7ef100
wined3d: Introduce basetexture_get_sub_resource() to simplify retrieving texture sub-resources.
2010-04-25 07:27:57 -05:00
958b523707
wined3d: Store texture sub-resources in IWineD3DBaseTextureClass.
2010-04-25 07:26:51 -05:00
3aaa6ee6e7
wined3d: Rename GlPixelFormatDesc to wined3d_format_desc.
2010-03-19 14:31:47 +01:00
604caf0caa
wined3d: Remove oversize texture support.
2010-03-15 14:23:15 +01:00
Stefan Dösinger