14bc0e9ef2
wined3d: Invalidate STATE_STREAMSRC when dropping VBOs.
2011-06-22 11:25:34 +02:00
acd8c58725
ddraw: Implement surface private data handling on top of wined3d_resource.
2011-06-22 11:25:27 +02:00
b5e04640cc
wined3d: Use a separate mutex for wndproc_table access.
...
If CreateDevice is called with hFocusWindow belonging to another thread,
then any code that does SendMessage (or equivalent) to the window while
holding the main wined3d mutex causes a deadlock, because wined3d_wndproc
tries to acquire the same mutex for wndproc_table access.
2011-06-21 16:18:56 +02:00
4582a0bcb3
wined3d: Make the device parameter to device_invalidate_state() const.
2011-06-21 11:25:18 +02:00
233b8e1cf8
wined3d: Fix the STATE_BASEVERTEXINDEX state entry.
2011-06-21 11:25:15 +02:00
265e62378f
wined3d: Validate STATE_BASEVERTEXINDEX in validate_state_table().
2011-06-21 11:25:13 +02:00
430bac5fad
wined3d: Only bother checking block alignment for compressed surfaces in wined3d_device_update_surface().
2011-06-21 11:25:09 +02:00
17eb3e2c74
wined3d: Initialize format block info with sane values for uncompressed formats.
2011-06-21 11:25:06 +02:00
73cec67c14
wined3d: Link STATE_BASEVERTEXINDEX to STATE_VDECL.
2011-06-20 19:32:02 +02:00
2daa16c96c
wined3d: Use base_vertex_index in drawStridedSlow, and only for indexed draws.
2011-06-20 19:32:02 +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
68b15bc5ff
wined3d: Give GL_ARB_map_buffer_range another try.
...
Nvidia's 270.xx.yy driver series fix the glMapBuffer alignment issues that caused major
performance problems. If the user is using an older driver we now drop the VBO instead of using
doublebuffered loading, which means that we fall back to the current behavior(no dynamic VBO) as
needed. Dynamic VBOs are needed on Nvidia drivers for GL_ARB_instanced_arrays.
2011-06-17 15:37:45 +02:00
12140b5158
wined3d: Drop the VBO when the GL alignment doesn't fit on dynamic buffers.
2011-06-17 15:37:41 +02:00
19a1b74252
wined3d: Add STATE_BASEVERTEXINDEX to debug_d3dstate.
2011-06-17 15:37:31 +02:00
37d70103a1
d3d8: Implement IDirect3DIndexBuffer8 private data handling on top of wined3d_resource.
2011-06-17 11:02:43 +02:00
469eba24c0
d3d9: Implement IDirect3DVertexBuffer9 private data handling on top of wined3d_resource.
2011-06-17 11:02:28 +02:00
45a0e95962
wined3d: Only load the surface for partial updates in wined3d_device_update_surface().
2011-06-17 11:02:21 +02:00
3a1d151561
wined3d: Use surface_load_location() instead of surface_internal_preload() in wined3d_device_update_surface().
2011-06-17 11:02:18 +02:00
26eb6c8eea
wined3d: Check the correct debug class in checkGLcall.
2011-06-16 11:16:41 +02:00
4621568922
wined3d: Only invert viewport y for onscreen destinations in surface_depth_blt().
...
This fixes a regression introduced by
032f8702ed
2011-06-16 11:16:31 +02:00
c51db63ba4
wined3d: Require ARB_shader_texture_lod for SM3.
2011-06-16 11:16:26 +02:00
6f710d18fc
wined3d: Fix source rectangle validation in wined3d_device_update_surface().
2011-06-16 11:16:19 +02:00
8153674c4a
wined3d: Don't clear the alloc flags in wined3d_surface_set_format().
...
Changing the format is only allowed for surfaces with format
WINED3DFMT_UNKNOWN, in which case there can't be a GL texture allocated.
2011-06-15 20:04:38 +02:00
c19c26e4be
wined3d: Check the source rectangle is a multiple of the format block size in wined3d_device_update_surface().
2011-06-15 12:51:51 +02:00
410a8e86f5
wined3d: Check for a valid source rectangle and destination in wined3d_device_update_surface().
2011-06-15 12:51:50 +02:00
b9133d7de0
wined3d: Implement wined3d_device_update_surface() on top of surface_upload_data().
2011-06-15 12:51:49 +02:00
a421278625
wined3d: Invalidate STATE_STREAMSRC in wined3d_device_draw_indexed_primitive_up.
2011-06-14 13:43:56 +02:00
dafd31861a
wined3d: Use GL_ARB_draw_elements_base_vertex if available.
2011-06-14 13:43:56 +02:00
7de2fa2670
wined3d: Add GL_ARB_draw_elements_base_vertex.
2011-06-14 13:43:56 +02:00
2bcd439818
wined3d: Don't just print a FIXME on error, handle it (Coverity).
2011-06-13 11:30:07 +02:00
2e3cf68e0b
wined3d: Silence R16 and AL16 fourcc warnings.
2011-06-10 10:45:42 +02:00
663fac5bcd
wined3d: Set last_was_blit to FALSE in the if condition that checks for it.
2011-06-10 10:45:38 +02:00
7b39005256
wined3d: Don't check the FBO status if FIXMEs are off.
2011-06-10 10:45:35 +02:00
980c50a087
wined3d: Move PBO handling mostly out of surface_upload_data().
...
Currently we essentially get half of the address from the caller and half from
the destination surface. Since we'd like to use surface_upload_data() for
wined3d_device_update_surface() as well, we should get all of it from the
caller.
2011-06-10 10:44:39 +02:00
a1b8f254b1
wined3d: Get rid of a NULL check for surface_upload_data().
2011-06-10 10:44:32 +02:00
9f3e6a20e8
wined3d: Handle unpack row length inside surface_upload_data().
2011-06-10 10:44:26 +02:00
ee6d550b2e
wined3d: Rename IWineD3DImpl_FillGLCaps() to wined3d_adapter_init_gl_caps().
2011-06-10 10:44:20 +02:00
d5c9523a83
wined3d: Rename IWineD3DDeviceImpl_UpdateVolume() to device_update_volume().
2011-06-10 10:44:17 +02:00
5173f9f05f
wined3d: Rename IWineD3DDeviceImpl_LoadLogo() to device_load_logo().
2011-06-08 14:12:40 +02:00
da125e6bca
wined3d: cfg can never be NULL in wined3d_check_pixel_format_color().
2011-06-08 14:12:40 +02:00
c24c2d1eac
wined3d: Rename IWineD3DImpl_IsPixelFormatCompatibleWithRenderFmt() to wined3d_check_pixel_format_color().
2011-06-08 14:12:40 +02:00
c23a5443c1
wined3d: Simplify context_apply_draw_buffers() a bit.
2011-06-07 18:12:03 +02:00
002674e49d
wined3d: Fix glDrawBuffers() optimization.
2011-06-07 18:12:01 +02:00
be180bed7c
wined3d: cfg can never be NULL in wined3d_check_pixel_format_depth().
2011-06-07 14:18:34 +02:00
fec6137de2
wined3d: Rename IWineD3DImpl_IsPixelFormatCompatibleWithDepthFmt to wined3d_check_pixel_format_depth().
2011-06-07 14:18:34 +02:00
01e668b007
wined3d: Use GL_DEPTH_COMPONENT as internal format for depth_blt_texture.
...
This also changes the texture level to always be zero while we're at it. In
practice depth/stencil textures should rarely have multiple levels, if ever,
but only 0 makes sense here.
2011-06-07 14:18:34 +02:00
95bd0ec61c
wined3d: Just enable ARB_shader_texture_lod if it's available.
2011-06-07 14:18:34 +02:00
1fbdfd625a
wined3d: Get rid of wined3d_texture_get_type().
2011-06-07 14:18:34 +02:00
84ce0020f4
wined3d: Rename Context_MarkStateDirty() to context_invalidate_state().
2011-06-06 16:18:48 +02:00
c8f26a1345
wined3d: Rename IWineD3DDeviceImpl_MarkStateDirty() to device_invalidate_state().
2011-06-06 16:18:41 +02:00
708d94212b
wined3d: Don't clamp vertex depth values.
...
Since we report D3DPMISCCAPS_CLIPTLVERTS.
2011-06-06 16:18:33 +02:00
6647c8f72d
wined3d: Mark some texture formats as filterable.
2011-06-03 12:46:07 +02:00
bc9407a452
wined3d: Set container of swapchain surfaces to WINED3D_CONTAINER_NONE in swapchain_init() error path.
2011-06-02 16:22:44 +02:00
5b9daccc66
wined3d: Call context_apply_draw_buffers under the GL lock.
2011-05-27 17:53:37 +02:00
dda91ac02a
wined3d: Call frag_pipe->enable_extension under the GL lock.
2011-05-26 16:41:14 +02:00
dbd8786394
wined3d: CMP supports _SAT.
...
This is a partial revert of c9ef1ed28c
2011-05-25 12:23:10 +02:00
b396886e5d
wined3d: Get rid of an unintentional variable.
2011-05-25 11:49:33 +02:00
019f6a8534
wined3d: Mask out writes to unused render targets.
...
Outputs not written by the pixel shader are undefined in GL, but in D3D the
render target is unmodified.
2011-05-25 11:49:23 +02:00
d5ee9a4014
wined3d: Check for unhandled resource usage flags.
2011-05-25 11:48:42 +02:00
6d31039034
wined3d: Rename IWineD3DDeviceImpl_FindTexUnitMap() to device_update_tex_unit_map().
2011-05-25 11:48:38 +02:00
813c273725
wined3d: Fix a few function definitions.
2011-05-24 12:47:28 +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
aba42d1fa5
wined3d: Introduce a separate structure for framebuffer state.
2011-05-19 10:07:57 +02:00
427803a981
wined3d: Make wined3d.h a normal header file again.
2011-05-19 10:07:50 +02:00
3032b40c80
wined3d: Get rid of the IWineD3DDeviceParent interface.
2011-05-19 10:06:21 +02:00
5c6c019340
wined3d: Remove maxConcurrentLights from the device.
2011-05-18 16:41:57 +02:00
1133991e85
wined3d: Make two variables unsigned.
2011-05-18 16:41:42 +02:00
3d229b814e
wined3d: Switch to the software cursor when the position diverges from the hardware one.
2011-05-17 10:18:26 +02:00
599d09b08c
wined3d: Always create the software cursor.
2011-05-17 10:17:31 +02:00
38d0d9fe80
wined3d: Only update the cursor position the first time we display it.
2011-05-17 10:15:18 +02:00
30e187e019
wined3d: Get rid of the haveHardwareCursor flag.
2011-05-17 10:12:31 +02:00
d52ae4b63f
wined3d: Get rid of the glsl_program_key_t typedef.
2011-05-17 10:06:34 +02:00
ef6c6f9ac9
wined3d: Get rid of the renderbuffer_entry_t typedef.
2011-05-17 10:06:30 +02:00
0e0e5c3e38
wined3d: Get rid of the IWineD3DDevice typedefs.
2011-05-17 10:06:23 +02:00
8d4ca1f815
wined3d: Remove COM from the device implementation.
2011-05-17 10:06:18 +02:00
979e3744f7
wined3d: Remove state management methods from the IWineD3DDevice interface.
2011-05-17 10:06:15 +02:00
e4038ebab9
wined3d: Fix a copypaste typo.
2011-05-16 16:35:30 +02:00
774cb21a4d
wined3d: Heightscaled surfaces still have an integer size.
2011-05-16 16:35:30 +02:00
1d7a05cb80
wined3d: Fix data types in RxGx snorm-unorm conversion.
2011-05-16 16:35:30 +02:00
1b860b11b3
wined3d: Cast clipplane doubles to floats.
2011-05-16 16:35:30 +02:00
20b147bfeb
wined3d: Consistently store format bitcounts in BYTEs.
2011-05-16 16:35:30 +02:00
c2aab4258a
wined3d: Separate two unrelated variables.
2011-05-13 17:05:27 +02:00
560c63d64e
wined3d: Pass the render target height as UINT.
2011-05-13 17:05:27 +02:00
a549b8f090
wined3d: Fix a few MSVC data loss warnings.
2011-05-13 17:05:27 +02:00
31901155ce
wined3d: Fix a unsigned unary minus warning in MSVC.
2011-05-13 17:05:27 +02:00
682bae7c2b
wined3d: Make the glram parameter of WineD3DAdapterChangeGLRam signed.
2011-05-13 17:05:27 +02:00
26dd1ed0e9
wined3d: Get rid of the SHADER_LIMITS typedef.
2011-05-11 14:56:48 +02:00
00a5f38595
wined3d: Remove object creation methods from the IWineD3DDevice interface.
2011-05-11 14:56:48 +02:00
e6ab3832b2
wined3d: Set SFLAG_DYNLOCK for lockable render targets.
2011-05-11 14:56:48 +02:00
5920de5ffb
Assorted spelling and case fixes.
2011-05-09 12:09:27 +02:00
0cbdd10c58
wined3d: Get rid of the WineD3D_PixelFormat typedef.
2011-05-06 14:23:46 +02:00
9f90225fa5
wined3d: Get rid of the wined3d_settings_t typedef.
2011-05-06 14:23:46 +02:00
493af7e5c1
wined3d: Introduce a helper function for translating blend factors.
2011-05-06 14:23:46 +02:00
f9f83fc884
wined3d: Add some initial access checking for resources.
...
Just print a WARN in surface_load_location() for the moment. We currently
pretend all resources are managed, strictly enforcing pool restrictions would
just break a lot of things.
2011-05-06 14:23:46 +02:00
49828372c1
wined3d: Fixed a operator precedence issue (Coverity).
2011-05-05 17:28:37 +02:00
4f96f4f467
wined3d: Fix pow handling with special values in ARB backend.
2011-05-05 17:26:12 +02:00
86b0c6bd7b
wined3d: Rename "shader_backend_t" to "wined3d_shader_backend_ops".
...
This makes it more consistent with the other call table names in wined3d.
2011-05-05 11:45:22 +02:00
d9f8cba50f
wined3d: Turn off message filtering temporarily in the Reset() method to allow certain messages (e.g. WM_ACTIVATEAPP) through.
2011-05-04 20:42:34 +02:00
6c8c68f7b6
wined3d: Make wined3d_event_query_test() and resource_get_type() static.
2011-05-03 14:38:06 +02:00
0116af3703
wined3d: Cleanup surfaces only once.
2011-05-03 14:38:06 +02:00
2fb6b509cb
wined3d: If Wine fails to acquire the focus window, allow the wndproc function to continue receiving messages.
2011-05-02 12:59:10 +02:00
f912e55610
wined3d: Fix an oops/crash in context_destroy_gl_resources().
...
Introduced by 96b150929b
2011-05-02 12:54:25 +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
ab199f56a6
wined3d: Merge the IWineD3DSurface::Blt() implementations.
2011-04-29 16:52:13 +02:00
29c95df7c3
wined3d: Merge the IWineD3DSurface::BltFast() implementations.
2011-04-29 16:52:12 +02:00
0b523df93c
wined3d: Merge the IWineD3DSurface::Flip() implementations.
2011-04-29 16:52:12 +02:00
eba8fd0b77
wined3d: Remove an unused field.
2011-04-28 16:47:14 +02:00
9da924039f
wined3d: Split pow instruction handling in the ARB backend.
2011-04-28 12:12:18 +02:00
db8d681a5b
wined3d: Remove rcp special handling of 0 from the ARB shader backend.
2011-04-28 12:11:55 +02:00
0210a8384a
wined3d: Add missing temporary variable declaration to ARB shader backend.
2011-04-28 12:11:53 +02:00
c5baf8f237
wined3d: Merge the IWineD3DSurface::SetFormat() implementations.
2011-04-28 11:08:55 +02:00
92120cb527
wined3d: Merge the IWineD3DSurface::SetMem() implementations.
2011-04-28 11:08:51 +02:00
a5febcf7a1
wined3d: Merge the IWineD3DSurface::ReleaseDC() implementations.
2011-04-28 11:08:45 +02:00
dcaca7225b
wined3d: Merge the IWineD3DSurface::GetDC() implementations.
2011-04-28 11:08:36 +02:00
13146e216f
wined3d: Merge the IWineD3DSurface::PreLoad() implementations.
2011-04-28 11:08:27 +02:00
34ba20fe35
wined3d: Merge the IWineD3DSurface::Unmap() implementations.
2011-04-27 11:50:53 +02:00
825341e7c2
wined3d: Merge the IWineD3DSurface::Map() implementations.
2011-04-27 11:50:48 +02:00
a2ef014342
wined3d: Merge the IWineD3DSurface::Release() implementations.
2011-04-27 11:50:41 +02:00
d9ace3c9f7
wined3d: Only invalidate the INDRAWABLE location for onscreen surfaces in surface_realize_palette().
...
For offscreen surfaces this might actually remove the texture we just loaded.
2011-04-27 11:50:35 +02:00
a05841bd1a
wined3d: Rename "pCaps" to "caps".
2011-04-27 11:50:29 +02:00
3f0120241b
wined3d: Enable SM3 if ARB_shader_texture_lod is supported.
2011-04-26 10:46:52 +02:00
9d0e17e9ea
wined3d: Either set SM3 for both vertex and fragment shaders or for neither.
2011-04-26 10:46:45 +02:00
f63a84be61
wined3d: Merge surface_base.c into surface.c.
2011-04-26 10:46:40 +02:00
11d44809bb
wined3d: Remove IWineD3DSurface::PrivateSetup() from the public interface.
2011-04-26 10:46:23 +02:00
dbc8702e44
wined3d: Scale the depthbias factor by the depth buffer's depth.
2011-04-22 17:51:29 +02:00
96b758f7b3
d3d: Map D3DRS_ZBIAS to WINED3DRS_DEPTHBIAS.
...
ZBIAS was removed in d3d9 and replaced with DEPTHBIAS. Currently
wined3d implements both independently which will cause trouble if we
want to set the depthbias value depending on the depth stencil format.
2011-04-22 17:51:29 +02:00
c852200b03
wined3d: Get rid of IWineD3DSurface::GetType().
2011-04-22 10:44:28 +02:00
cc39bde98d
wined3d: Get rid of wined3d_volume_get_type().
2011-04-22 10:44:23 +02:00
efc080e3a3
wined3d: Get rid of wined3d_buffer_get_type().
2011-04-22 10:44:20 +02:00
82e39ced7f
wined3d: Make sure we release the correct DC in context_update_window().
2011-04-22 10:44:16 +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
a3c12c5be4
wined3d: Fallback to our private window when context activation fails otherwise.
2011-04-20 16:31:48 +02:00
edebabc2ec
wined3d: Add two functions for GL context activation/restore.
2011-04-20 16:31:45 +02:00
0de0e81793
wined3d: Decrement the vertex declaration refcount on stateblock destruction.
2011-04-20 13:06:35 +02:00
e30a057487
wined3d: Don't bother unsetting texture resources in IWineD3DDeviceImpl_Uninit3D().
...
Releasing the stateblock already takes care of this.
2011-04-19 13:29:36 +02:00
4651746102
wined3d: Set resource bindings to NULL before releasing them on stateblock destruction.
...
To prevent ERRs from device_resource_released().
2011-04-19 13:29:32 +02:00
516ade9b2b
wined3d: Also update ds_current_size if there's no current DS location in surface_load_ds_location().
2011-04-19 13:29:28 +02:00
84d50f7353
wined3d: Remove IWineD3DSurface::GetImplType() from the public interface.
2011-04-18 11:45:55 +02:00
52edf556f6
wined3d: Merge surface_gdi.c into surface.c.
2011-04-18 11:45:51 +02:00
38800d8e9a
wined3d: Forward volume refcounts to the container.
2011-04-18 11:45:20 +02:00
fadfdf21c0
wined3d: Forward surface refcounts to the container.
...
This will prevent textures from being released if one of its surfaces is still
in use by the stateblock. We have similar constructions in d3d8 and d3d9, but
those won't prevent the wined3d texture from being released.
2011-04-18 11:45:17 +02:00
a5983e0c3d
wined3d: Use the correct mask for depth/stencil locations in surface_load_ds_location().
2011-04-18 11:45:09 +02:00
6a135a1511
wined3d: Get rid of the IWineD3DBase interface.
2011-04-15 10:07:58 +02:00
7b8bbdcc44
wined3d: Get rid of the IWineD3DResource interface.
2011-04-15 10:07:58 +02:00
66875c6dc7
wined3d: Don't flush just because a swapchain has multiple contexts.
...
If you really have e.g. multiple draws to the same drawable, this is not
enough, and you should use the StrictDrawOrdering registry setting. In the
other cases it just slows things down unnecessarily.
2011-04-15 10:07:58 +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
Henri Verbeet