bf73d23d95
wined3d: Separate detection of D3D10+ and D3D9 Nvidia GPUs.
2010-04-14 18:00:47 +02:00
4c87bc0c41
wined3d: Move A4L4 conversion to the formats table.
2010-04-14 18:00:47 +02:00
cda78c01e6
wined3d: Move G16R16/R16G16F conversion to the formats table.
2010-04-14 18:00:47 +02:00
43e89cb981
wined3d: Prune unsupported world matrix transform states.
2010-04-13 21:13:54 +02:00
71d484303a
wined3d: We always support at least a single modelview matrix.
2010-04-13 21:13:50 +02:00
8eb2a2cf0c
wined3d: Disable strict draw ordering by default.
...
While some performance hit from the extra flushes was expected and would be
acceptable, the performance hit can be over 50% on some configurations, which
clearly isn't acceptable. This patch introduces a "StrictDrawOrdering"
registry key for applications affected by this, until we have a more
structural solution.
2010-04-13 21:13:36 +02:00
ab80e9739c
wined3d: Add a separate function for palette initialization.
2010-04-13 21:13:26 +02:00
d1d8c81439
wined3d: Add a separate function for rendertarget view initialization.
2010-04-13 21:13:21 +02:00
e35f54ef1f
wined3d: Move R32G32F convertion to the formats table.
2010-04-13 17:56:35 +02:00
5c635f4146
wined3d: Move D15S1 over to the formats table.
2010-04-13 17:56:32 +02:00
6a081ef95a
wined3d: Move D24X4S4 to the formats table.
2010-04-13 17:56:29 +02:00
485040bb5c
wined3d: Move D24FS8 to formats table.
2010-04-13 17:56:27 +02:00
798ba56c1b
wined3d: Move L6V5U5 conversion to the formats table.
2010-04-13 17:56:24 +02:00
a4fad54134
wined3d: Don't write past the end of the buffer's conversion_map.
2010-04-12 11:33:32 +02:00
5f7e087644
wined3d: Fix a GL extension prototype.
2010-04-12 11:33:28 +02:00
76a9712779
wined3d: Add an initial implementation of arbfp_blit_surface.
2010-04-09 16:50:21 +02:00
f1ca14cb5b
wined3d: Add an initial fbo_blit_supported implementation.
2010-04-09 16:50:21 +02:00
7df7ce40c3
wined3d: Move X8L8V8U8 surface conversion to the format table.
2010-04-09 16:50:21 +02:00
60c6294f84
wined3d: Move Q8W8V8U8 conversion to the format table.
2010-04-09 16:50:20 +02:00
d7e1b973c7
wined3d: Start moving texture format fixups to the formats table.
2010-04-09 16:50:20 +02:00
a4559e761b
wined3d: Move srgb checks away from d3dfmt_get_conv.
2010-04-09 16:50:20 +02:00
00598c3e36
wined3d: Let d3dfmt_get_conv return a wined3d_format_desc.
2010-04-09 16:50:20 +02:00
90f4ae6948
wined3d: Remove unused offset parameter in buffer_get_memory.
2010-04-09 15:47:23 +02:00
1c02a909e5
wined3d: Remove remaining redundant code from d3dfmt_get_conv.
2010-04-08 17:34:18 +02:00
d373e14d53
wined3d: Add a FIXME for predicated shader instructions.
2010-04-08 12:26:10 +02:00
284e92def9
wined3d: Validate some more states.
2010-04-08 12:26:07 +02:00
e24473d531
wined3d: Update shader constants on viewport changes.
...
Otherwise the vertex shader will see stale posFixup values.
2010-04-08 12:25:51 +02:00
cece23c7c9
wined3d: Get rid of state_nogl().
...
It's unused, all states that have this as handler have a 0 representative.
2010-04-08 12:25:43 +02:00
3f79ba3019
wined3d: Add an extensionless STATE_INDEXBUFFER handler.
2010-04-08 12:25:38 +02:00
2c5eee25ca
wined3d: Only apply float R16G16F/R32G32F fixup when ARB_texture_rg isn't around and remove redundant code.
2010-04-07 18:14:05 +02:00
edcdbc2a76
wined3d: Remove redundant gl format/type code from d3dfmt_get_conv since it is already in the table.
2010-04-07 18:13:49 +02:00
e7a71e15b5
wined3d: Turn blit_shader color_fixup_supported into blit_supported.
2010-04-07 18:13:35 +02:00
55a96174c8
wined3d: Add a separate function for adding declaration elements in ConvertFvfToDeclaration().
2010-04-07 13:50:23 +02:00
be9e077a4d
wined3d: Pass the correct window to Present() in IWineGDISurfaceImpl_Flip().
2010-04-07 13:50:19 +02:00
83443273c1
wined3d: Pass the correct window to Present() in IWineD3DSurfaceImpl_Flip().
2010-04-07 13:50:16 +02:00
3b7774b37b
wined3d: Pass the correct window to Present() in IWineD3DSurfaceImpl_BltOverride().
2010-04-07 13:50:12 +02:00
e6ae272efe
wined3d: Due to code rewrites is_color_fixup_supported is not needed anymore in RealizePalette.
...
The code in question should be executed in all cases. This also fixes
palette refresh issues when shaders / paletted textures aren't around.
2010-04-06 13:55:14 +02:00
1f2976a302
wined3d: Move the arbfp p8 fixup to the format table and get rid of the d3dfmt_get_conv override.
2010-04-06 13:55:02 +02:00
a5a4be4fc5
wined3d: Disable framebuffer to texture blitting.
...
The current code doesn't work for this at all and causes major
rendering issues in e.g. C&C. I don't think we should fix this code
either since it isn't worth the effort and requires evil things like
paletteOverride.
2010-04-06 13:54:47 +02:00
9fec1a02b9
wined3d: Disable paletted texture support. It was only offered on a few cards, so can be missed.
2010-04-06 13:54:06 +02:00
69902ab6d0
wined3d: Move EXT_PALETTED_TEXTURE code over to ffp_blit.
2010-04-06 13:53:21 +02:00
3b6aea5934
wined3d: Move palette uploading code over to arbfp blit_shader.
2010-04-06 13:53:15 +02:00
f41ee7cd0a
wined3d: Capture the correct scissor rectangle.
...
This bug was originally introduced by
d4b63bbd871f029a30db
2010-04-06 11:48:51 +02:00
2381c9529d
wined3d: Don't use GLSL if the supported version isn't at least 1.20.
2010-04-06 11:48:47 +02:00
ca1b35aaff
wined3d: Rename some GL vendors.
...
GL_VENDOR_ATI -> GL_VENDOR_FGLRX because it's much more specific. Besides, AMD
also works on the Mesa drivers.
2010-04-05 11:37:45 +02:00
b8211a67d4
wined3d: Rename HW_VENDOR_WINE to HW_VENDOR_SOFTWARE.
...
Software adapters like the refrast also return a 0 PCI ID on Windows.
2010-04-05 11:37:39 +02:00
224c376528
wined3d: Make some functions static.
2010-04-05 11:37:34 +02:00
fcee05586b
wined3d: Simply inline dumpResources().
2010-04-05 11:37:28 +02:00
5ce986f1de
wined3d: Add a separate function for wined3d object initialization.
2010-04-05 11:37:24 +02:00
ae8d9e21e3
wined3d: Remove the swapchain parameter from fb_copy_to_texture_hwstretch in order to unify all blit calls.
2010-04-02 15:22:51 +02:00
ff82e66a69
wined3d: Move upsideDown calculation to blit implementation.
2010-04-02 15:22:51 +02:00
23bfdecd8b
wined3d: Verify all render states have a handler.
2010-04-02 10:36:17 +02:00
1289842da3
wined3d: Move handling of the unimplemented WINED3DRS_STIPPLEPATTERN states to ddraw.
2010-04-02 10:36:06 +02:00
2e5976a8c5
wined3d: Move handling of the unimplemented WINED3DRS_BORDERCOLOR state to ddraw.
2010-04-02 10:35:54 +02:00
af9510f400
wined3d: Remove some unused render states.
2010-04-02 10:35:44 +02:00
e62771f7f7
wined3d: Add a state handler for WINED3DRS_ZVISIBLE.
2010-04-02 10:35:37 +02:00
ef34b0ba06
wined3d: Verify state representatives represent themselves.
...
This ensures there's no multilevel indirection in the state table.
2010-04-02 10:35:30 +02:00
a2344e7288
wined3d: Remove some superfluous white space and braces from the card selection functions.
2010-04-01 18:12:55 +02:00
8afeb34559
wined3d: Add a state table entry for WINED3DRS_INDEXEDVERTEXBLENDENABLE.
2010-04-01 18:12:42 +02:00
f4330add39
wined3d: Verify each state table entry has either a handler or a representative.
2010-04-01 18:12:42 +02:00
57cfd613a5
wined3d: Explicitly set the state handler to NULL for states with a representative.
...
We should never call the handler for states that have a rep.
2010-04-01 18:12:42 +02:00
f70193b915
wined3d: Use the rep instead of the apply function to determine if a state is used.
2010-04-01 18:12:42 +02:00
03c472bff0
wined3d: Don't call directly into the state table.
2010-04-01 18:12:42 +02:00
a298f37a9a
wined3d: Add a state table entry for WINED3DRS_TWEENFACTOR.
2010-03-31 16:32:57 +02:00
6e1ed1c167
wined3d: Print a FIXME/WARN for all unsupported vertex blend flags.
2010-03-31 16:32:52 +02:00
91db9f8bd3
wined3d: Remove a redundant initialization in IWineD3DDeviceImpl_UpdateSurface().
2010-03-31 16:32:41 +02:00
3af0909693
wined3d: Get rid of some mostly useless local variables in IWineD3DDeviceImpl_UpdateSurface().
2010-03-31 16:32:35 +02:00
61ca407151
wined3d: Cleanup variable naming in IWineD3DDeviceImpl_UpdateSurface().
2010-03-31 16:32:29 +02:00
dc918d4394
wined3d: Use FBOs when the onscreen depth stencil format isn't suitable.
...
This allows proper support of float depth buffers when rendering to onscreen surfaces.
2010-03-31 16:12:32 +02:00
19b6f5ca75
wined3d: Control the onscreen depth stencil format in the swapchain.
...
This allows the swapchain to know what depth format its window contexts have to see if the
requested depth format is compatible or a FBO fallback is needed, and it will be needed to
set the onscreen format to the requested auto depth stencil format instead of the
let's-hope-it-fits D24_UNORM_S8_UINT format.
2010-03-31 16:12:31 +02:00
a4b0bedc30
wined3d: Split out offscreen rendering concerns from FindContext.
2010-03-31 16:12:31 +02:00
c6f0ddcb1a
wined3d: Remove some unneeded source rectangle calculations from BltOverride.
2010-03-31 16:12:30 +02:00
87b5b2f738
wined3d: Remove the last use of the WINED3DRECT destination rectangle in BltOverride.
2010-03-31 16:12:30 +02:00
40f3f0b041
wined3d: Use RECT instead of WINED3DRECT in fb_copy_to_texture_hwstretch.
2010-03-31 16:12:29 +02:00
7f1f61e28e
wined3d: Use RECT instead of WINED3DRECT in fb_copy_to_texture_direct.
2010-03-31 16:12:28 +02:00
ae26d9defd
wined3d: Use RECT instead of WINED3DRECT in stretch_rect_fbo.
2010-03-31 16:12:27 +02:00
72be7fe3a5
wined3d: Get rid of destFormat and srcFormat in IWineD3DDeviceImpl_UpdateSurface().
2010-03-30 14:49:32 +02:00
eced5fe8ec
wined3d: Calculate "offset" in the appropriate path in IWineD3DDeviceImpl_UpdateSurface().
2010-03-30 14:49:32 +02:00
bb94bc3823
wined3d: Add more general support for partial updates of compressed surfaces to IWineD3DDeviceImpl_UpdateSurface().
2010-03-30 14:49:31 +02:00
88a2decc49
wined3d: Source and destination formats should match in IWineD3DDeviceImpl_UpdateSurface().
2010-03-30 14:49:31 +02:00
0eae42ddc6
wined3d: Use GL_UNPACK_ROW_LENGTH for partial updates of regular surfaces in IWineD3DDeviceImpl_UpdateSurface().
2010-03-30 14:49:31 +02:00
2533860114
wined3d: Initialization functions don't allocate.
2010-03-30 14:49:31 +02:00
c864ae6348
wined3d: Disable flipping through the source rectangle in BltOverride.
2010-03-30 14:10:45 +02:00
334fea7d79
wined3d: Fix a destination flipping bug using the destination rectangle.
2010-03-30 14:10:37 +02:00
a91f844a3d
wined3d: Use RECT instead of WINED3DRECT in more parts of BltOverride.
2010-03-30 13:54:45 +02:00
682c969e9a
wined3d: Add a helper function for getting a valid rectangle.
2010-03-30 13:54:35 +02:00
a7d3b616c4
wined3d: Add color_fill to blit_shader.
2010-03-30 13:54:24 +02:00
9a1fd552d2
wined3d: Introduce a helper function which converts a color from the surface format to ARGB.
2010-03-30 13:54:12 +02:00
f724843f14
wined3d: Move argb_to_fmt to utils.c as a helper function to be used in more places.
2010-03-30 13:53:54 +02:00
f69d0fa00d
wined3d: GL errors aren't FIXMEs.
2010-03-29 15:51:21 +02:00
6997c8d70c
wined3d: Remove superfluous cast of zero.
2010-03-29 11:49:58 +02:00
eb064db083
wined3d: Add support for partial updates of compressed surfaces to IWineD3DDeviceImpl_UpdateSurface().
2010-03-26 10:29:39 +01:00
941c7da08e
wined3d: Don't warn about independent color write masks when the masks are all the same.
2010-03-26 10:29:34 +01:00
4651dd86bf
wined3d: Implement independent color write masks.
2010-03-26 10:29:29 +01:00
13a57c81f0
wined3d: Add support for EXT_draw_buffers2.
2010-03-26 10:29:23 +01:00
d5ff1e640c
wined3d: glColorMask() changes the write mask for all render targets.
2010-03-26 10:29:17 +01:00
8cf63f0aee
wined3d: Add GL locking to match_fbo_tex_update().
2010-03-26 10:29:13 +01:00
f74de3ab65
wined3d: Don't advertise float formats as supported by WGL.
2010-03-26 10:28:52 +01:00
7b43cb1877
wined3d: Don't check WGL depth stencil limitations with FBOs.
2010-03-26 10:28:48 +01:00
9866125e23
wined3d: Just mark the color write mask dirty in IWineD3DDeviceImpl_ClearSurface().
2010-03-25 10:01:59 +01:00
9eb5ba435e
wined3d: Use the same order of operations for depth clears as for stencil clears.
2010-03-25 10:01:54 +01:00
2e7e118899
wined3d: Just mark the stencil write mask dirty in IWineD3DDeviceImpl_ClearSurface().
2010-03-25 10:01:49 +01:00
1c4e9e6a0e
wined3d: Disable two-sided stencil when doing stencil clears.
2010-03-25 10:01:44 +01:00
1181762f99
wined3d: Implement manual buffer fencing.
2010-03-23 12:31:15 +01:00
fd13a6ae23
wined3d: Partially implement unserialized buffers with the apple extension.
2010-03-23 12:30:18 +01:00
5d94fe2095
wined3d: Add a function for deleting the GL buffer.
2010-03-23 12:29:33 +01:00
8f604afa96
wined3d: Remove WGL RGBA float support because it doesn't make sense without pbuffers.
2010-03-22 11:41:03 +01:00
28a2c7ab29
wined3d: Use the format table instead of WGL-checks in CheckDepthStencilMatch when FBOs are used.
2010-03-22 11:40:52 +01:00
5ffb088975
wined3d: Fix depth blit regression.
2010-03-22 11:40:40 +01:00
3428b94a8d
Assorted spelling and case fixes.
2010-03-22 10:49:13 +01:00
122129f94a
wined3d: Add COMPLEX_FIXUP_NONE as value 0 to the complex_fixup enum.
...
To prevent get_complex_fixup() from returning COMPLEX_FIXUP_YUY2 for simple
fixups.
2010-03-19 14:31:59 +01:00
12608b0a0d
wined3d: Unify "gl_formats_template" naming with the other format info tables.
2010-03-19 14:31:51 +01:00
3aaa6ee6e7
wined3d: Rename GlPixelFormatDesc to wined3d_format_desc.
2010-03-19 14:31:47 +01:00
4cd69b8a09
wined3d: Simplify the generated GLSL for NRM.
2010-03-19 14:31:40 +01:00
fb8812db89
wined3d: Get rid of d3dfmt_get_conv in RealizePalette.
2010-03-19 13:15:26 +01:00
27a96e477a
wined3d: Start moving paletted texture support to the blit_shader.
2010-03-19 13:15:21 +01:00
fd99ab78c2
wined3d: Use draw_textured_quad in BltOverride.
2010-03-19 13:15:06 +01:00
4bd627cc7f
wined3d: Add a helper function for drawing a textured quad.
2010-03-19 13:15:03 +01:00
7c930589bc
wined3d: Avoid some common invalid context accesses.
...
Unfortunately there are plenty of other places left. Perhaps we should
consider creating our own window when the context becomes invalid and making
the context current on that instead.
2010-03-18 10:25:09 +01:00
135f364110
wined3d: Kill VTRACE.
2010-03-18 10:25:02 +01:00
f2bcd32bff
wined3d: Replace some VTRACEs with proper TRACEs.
2010-03-18 10:24:51 +01:00
e5673ddbc3
wined3d: Add a quirk to rebind FBOs when one of their attached textures is updated.
...
Updating a texture while it is attached to the currently bound FBO is
something GL implementations tend to get wrong. NVIDIA fails at
glTexSubImage2D(), fglrx and Mesa with glTexImage2D(). I'm afraid to try what
happens on OS X. Fortunately we never use glTexImage2D() while a texture is
attached to an FBO, so we only need to care about glTexSubImage2D().
2010-03-18 10:24:41 +01:00
bd4fb33a52
wined3d: Unify GLINFO_LOCATION in surface.c.
2010-03-18 10:24:33 +01:00
914c8cb8ea
ddraw: Acquire/release the focus window from the correct location.
2010-03-18 10:24:15 +01:00
0838d0ab64
wined3d: Make the focus window also the foreground window.
2010-03-18 10:24:05 +01:00
d790530df3
wined3d: Make resources 16 byte aligned.
2010-03-17 13:36:39 +01:00
b621fac215
wined3d: Merge two if conditions in buffer.c.
2010-03-17 13:36:17 +01:00
e385748258
wined3d: Add surface conversion function from WINED3DFMT_YUY2 to WINED3DFMT_B8G8R8X8_UNORM.
2010-03-17 10:59:18 +01:00
4e48ae2629
ddraw: Implement IDirectDrawImpl_GetSurfaceFromDC().
...
This is a pretty naive implementation, should that become a performance
problem it's easy enough to speed up with a search tree of some kind.
2010-03-17 10:06:25 +01:00
7b52c2fbed
wined3d: Cleanup IWineD3DDeviceImpl_SetFrontBackBuffers().
2010-03-17 10:06:21 +01:00
e9dbd5bff8
wined3d: Don't change the draw buffer in IWineD3DDeviceImpl_SetFrontBackBuffers().
...
This should be handled by the context's draw buffer management.
2010-03-17 10:06:18 +01:00
509b038cf5
wined3d: Simplify the IWineD3DDeviceImpl_ClearSurface() surface loading code.
2010-03-17 10:06:15 +01:00
2b86950c3b
wined3d: Simplify context_apply_attachment_filter_states() flow a bit.
2010-03-17 10:06:12 +01:00
ec10c1ed8d
wined3d: Add missing checkGLcall's to buffer_Map().
2010-03-17 10:06:09 +01:00
570f865bad
wined3d: Don't use framebuffer blit for backbuffer formats with fixups in swapchain_blit().
2010-03-17 10:06:06 +01:00
60e98cc3ad
wined3d: Don't use filtering on textures that need complex fixups in swapchain_blit().
...
For example, interpolating palette indices doesn't have the desired result.
Should we really want filtering for these cases we could implement it inside
the relevant shaders, after the fixup, but I doubt it's worth the effort.
2010-03-17 10:06:03 +01:00
c48adfe201
wined3d: Use "gl_filter" in the non-FBO path of swapchain_blit() as well.
2010-03-17 10:05:59 +01:00
cc6d17ba7c
wined3d: Check the alignment of mapped buffer pointers.
...
Windows returns 32 byte aligned pointers when locking vertex and index
buffers, and some applications(Half Life 2, Alpha Prime, possibly others)
rely on this. Check the alignment and fall back to double buffered
buffers with HeapAlloced and aligned pointers if the alignment doesn't
fit.
2010-03-16 17:03:13 +01:00
6c53871d30
wined3d: Implement unfenced updates of double buffered buffers.
2010-03-16 17:02:50 +01:00
1691a6d7d0
wined3d: Use glMapBuffer for 1:1 uploads in PreLoad.
...
This is needed to take advantage of asynchronous uploads with double buffered buffers
2010-03-16 17:02:43 +01:00
04752991b1
wined3d: Don't DISCARD or NOOVERWRITE non-dynamic buffers.
...
Shaiya locks a non-dynamic buffer with the DISCARD flag and expects
the contents to be retained. The SDK says DISCARD requires dynamic
resources, and Windows 7 returns an error in this situation, crashing
Shaiya. This patch sticks to the Windows XP behavior and allows the
lock, but ignores the DISCARD flag to retain the buffer contents.
2010-03-16 17:02:34 +01:00
bef5645eb1
makefiles: Remove the no longer needed explicit separators for dependencies.
2010-03-16 13:28:19 +01:00
a7aa4a87e2
wined3d: Fix ATI2N pitch and offset calculations.
2010-03-16 13:03:30 +01:00
78166b0b23
wined3d: Implement SetDestWindowOverride() by simply making the context current on a different window.
2010-03-16 11:45:15 +01:00
cd9a8b74b9
wined3d: Store the device window in the swapchain.
...
The swapchain's current window might be changed by SetDestWindowOverride().
2010-03-16 11:45:11 +01:00
aa819fe888
wined3d: Simplify a comparison in IWineD3DDeviceImpl_Reset().
2010-03-16 11:45:06 +01:00
d6bbe90b85
wined3d: The swapchain should always have a window handle.
2010-03-16 11:45:01 +01:00
0ae49c35fb
wined3d: Use the context's window handle in IWineD3DSurfaceImpl_BltOverride().
2010-03-16 11:44:55 +01:00
7b0b16fafe
wined3d: Use the context's window handle in stretch_rect_fbo().
2010-03-16 11:44:50 +01:00
18ec2525a4
wined3d: Store the swapchain instead of the surface in the context.
2010-03-16 11:44:44 +01:00
Roderick Colenbrander