89d0d3ffd8
wined3d: Get rid of the device parameter to context_setup_target().
2011-10-26 12:41:33 +02:00
a42774f042
wined3d: Only check for sRGB attachability when needed in surface_load_texture().
2011-10-26 12:41:33 +02:00
bc3c72f2cc
wined3d: Mark a format as sRGB attachable if the internal format is the same for RGB and sRGB.
2011-10-26 12:41:32 +02:00
bab2a40f87
wined3d: Make the device parameter to context_apply_clear_state() const.
2011-10-25 16:57:24 +02:00
9b42c657e4
wined3d: Make the device parameter to context_apply_blit_state() const.
2011-10-25 16:57:24 +02:00
2da4f87a7e
wined3d: Upload directly from the source surface in wined3d_surface_blt(), if possible.
...
This avoids either loading sysmem surfaces into video memory (wasting GPU
memory) and then doing a blit on the GPU, or downloading GPU surfaces to
sysmem, doing a blit on the CPU, and likely uploading it again. This mostly
matters for ddraw and d3d8 applications, d3d9 already has to go through
wined3d_device_update_surface() to transfer data from sysmem surfaces to GPU
surfaces.
2011-10-25 16:57:23 +02:00
284ba950ef
wined3d: Make the device parameter to SetupForBlit() const.
2011-10-24 11:16:47 +02:00
96187a54a9
wined3d: Make the context parameter to bind_dummy_textures() const.
2011-10-24 11:16:44 +02:00
e6101816a2
wined3d: Get rid of surface_gdi_cleanup().
...
It's effectively the same as surface_cleanup(). The GL objects that
surface_cleanup() destroys are never created for "GDI" surfaces.
2011-10-24 11:16:40 +02:00
6e8273177a
wined3d: Reject multisampled readbacks in wined3d_surface_get_render_target_data().
2011-10-24 11:16:33 +02:00
4229d865d2
wined3d: Only try to load surfaces from the drawable if the drawable is current in surface_load_sysmem().
2011-10-24 11:16:27 +02:00
f28ba9007e
wined3d: Make the device parameter to context_choose_pixel_format() const.
2011-10-21 12:09:46 +02:00
a2c754dde8
wined3d: Make the device parameter to wined3d_device_get_surface_from_dc() const.
2011-10-21 12:09:43 +02:00
5f6dd5384c
wined3d: Move the cursor in wined3d_device_set_cursor_position().
2011-10-21 12:09:34 +02:00
da32d34439
wined3d: Make the device parameter to wined3d_device_get_gamma_ramp() const.
2011-10-20 11:03:28 +02:00
23ee1a451b
wined3d: Make the device parameter to wined3d_device_set_gamma_ramp() const.
2011-10-20 11:03:22 +02:00
82f067f5cd
wined3d: Allow loading multisampled surfaces into sysmem.
2011-10-20 11:02:57 +02:00
73723911aa
wined3d: Make the device parameter to wined3d_device_get_creation_parameters() const.
2011-10-19 12:24:43 +02:00
d607586d62
wined3d: Make the present_parameters parameter to wined3d_device_reset() const.
2011-10-19 12:24:36 +02:00
3042860478
wined3d: Detach any attached overlays on surface cleanup.
...
Spotted by Dan Kegel / Valgrind.
2011-10-19 12:23:47 +02:00
6cc9a89c8a
wined3d: Make the device parameter to is_display_mode_supported() const.
2011-10-18 15:10:33 +02:00
71640e00f9
wined3d: Make the device parameter to invalidate_active_texture() const.
2011-10-18 15:10:27 +02:00
68e1484bec
wined3d: Mark default pool surfaces lost when they're unloaded.
2011-10-18 15:10:13 +02:00
ca43c49968
wined3d: Keep surfaces in sysmem if they're both already there in wined3d_surface_blt().
...
The idea is to avoid bouncing surfaces between the CPU and GPU when doing both
locks and blits on a surface. This is mostly an issue for ddraw applications.
2011-10-18 15:10:06 +02:00
f90d402610
wined3d: Fixed sizeof (Coverity).
2011-10-17 17:45:03 +02:00
fcd1de2b09
wined3d: Make the device parameter to wined3d_device_get_depth_stencil() const.
2011-10-17 17:45:02 +02:00
ebbd5ecf7c
wined3d: Make the device parameter to wined3d_device_get_render_target() const.
2011-10-17 17:45:02 +02:00
25b1130b44
wined3d: Also restore the pixel format in context_restore_gl_context().
2011-10-17 17:45:02 +02:00
cdc9aadf5c
wined3d: Don't try to access the swapchain of a destroyed context in context_set_gl_context().
2011-10-17 17:45:02 +02:00
dfea2ab6f4
wined3d: Don't bother updating the context's window in context_destroy_gl_resources().
...
context_update_window() accesses the swapchain, which may not exist if this is
a destroyed context, and we don't do anything that needs displaying here
anyway.
2011-10-17 17:45:02 +02:00
819225d98b
wined3d: Mark some fall-throughs in switch statements.
2011-10-14 13:12:28 +02:00
a9fcaed610
wined3d: Make the device parameter to wined3d_device_get_npatch_mode() const.
2011-10-14 13:12:27 +02:00
39f898b26a
wined3d: Make the device parameter to wined3d_device_get_raster_status() const.
2011-10-14 13:12:27 +02:00
7ffa768e71
wined3d: Cleanup context_create() error handling a bit.
2011-10-14 13:12:27 +02:00
67b097cd6e
wined3d: Get rid of the mostly unused "pfd" variable in context_create().
2011-10-14 13:12:27 +02:00
35f7610630
wined3d: Remove an obsolete comment.
2011-10-13 19:57:19 +02:00
aacbc7e2b7
wined3d: Recognize "Brian Paul" as a mesa card vendor.
2011-10-13 19:57:19 +02:00
652d80d9d8
wined3d: Make the device parameter to wined3d_device_get_software_vertex_processing() const.
2011-10-11 19:43:41 +02:00
dd2378cbf2
wined3d: Make the device parameter to wined3d_device_validate_device() const.
2011-10-11 19:43:38 +02:00
229662fc46
wined3d: Make the device parameter to wined3d_device_get_front_buffer_data() const.
2011-10-11 19:43:35 +02:00
496b438ede
wined3d: Remove d3d8/9 palette support.
2011-10-11 13:37:49 +02:00
39a8ed3a00
wined3d: Make the device parameter to wined3d_device_get_primitive_type() const.
2011-10-10 13:40:38 +02:00
739a9d9805
wined3d: Return WINED3DERR_NOTFOUND if the render target is NULL in wined3d_device_get_render_target().
...
This is similar to how wined3d_device_get_depth_stencil() works.
2011-10-10 13:39:39 +02:00
adf9e6120d
wined3d: Make the device parameter to wined3d_device_present() const.
2011-10-03 14:38:56 -05:00
2a146448f4
wined3d: When creating a new shader, check shader type and version.
2011-09-26 17:57:48 +02:00
013991e6e4
wined3d: Make the device parameter to wined3d_device_get_display_mode() const.
2011-09-22 09:39:16 +02:00
72d75b65b7
wined3d: Make the device parameter to wined3d_device_get_device_caps() const.
2011-09-22 09:39:14 +02:00
ef62e41fca
wined3d: Fix spelling.
2011-09-21 11:35:43 +02:00
5177a5f686
wined3d: Make the device parameter to wined3d_device_get_back_buffer() const.
2011-09-20 16:21:38 +02:00
11323b4416
wined3d: Make the device parameter to wined3d_device_get_texture() const.
2011-09-20 16:21:38 +02:00
5609f062d2
wined3d: Dump the WINEDDBLTFX structure in wined3d_surface_blt().
2011-09-20 16:21:38 +02:00
ba69e7802a
wined3d: Make the device parameter to wined3d_device_get_texture_stage_state() const.
2011-09-19 17:56:05 +02:00
fda48415ac
wined3d: Make the declaration parameter to wined3d_device_process_vertices() const.
2011-09-19 17:56:05 +02:00
0ad7e98d24
wined3d: Make the device parameter to process_vertices_strided() const.
2011-09-16 17:23:08 +02:00
a61fe27fb8
wined3d: Make the device parameter to wined3d_device_get_ps_consts_f() const.
2011-09-16 17:23:08 +02:00
b9fcf71c71
ddraw: Use real flips.
2011-09-16 17:23:08 +02:00
eb79a26493
wined3d: Only the ARBfp fragement pipeline reads emulated clip coords.
2011-09-15 15:41:41 +02:00
9bcd58f312
wined3d: Disable range fog with per-pixel fog.
2011-09-15 15:41:41 +02:00
73a4deb0b8
wined3d: Make the device parameter to wined3d_device_get_ps_consts_i() const.
2011-09-15 15:41:40 +02:00
fc488f4949
wined3d: Make the device parameter to wined3d_device_get_ps_consts_b() const.
2011-09-15 15:41:40 +02:00
8009a4947b
wined3d: Flush after surface updates.
...
This is similar to 5d1d07abcf
2011-09-15 15:41:40 +02:00
65064a09ce
wined3d: Make the device parameter to wined3d_device_get_pixel_shader() const.
2011-09-14 09:59:20 +02:00
8a12e951e6
wined3d: Make the device parameter to device_unit_free_for_vs() const.
2011-09-14 09:59:18 +02:00
c67ca538bb
wined3d: Make the device parameter to wined3d_device_get_vs_consts_f() const.
2011-09-13 09:19:57 +02:00
4ba464bd4c
wined3d: Rename markTextureStagesDirty() to device_invalidate_texture_stage().
2011-09-13 09:19:53 +02:00
66637ea35c
wined3d: Don't print the context recreation FIXME for FBO ORM.
...
With FBOs we can just render offscreen to an appropriate depth/stencil buffer.
2011-09-13 09:19:46 +02:00
efba48ccfb
wined3d: Don't load/unload unsupported texture coordinate attribs.
2011-09-12 10:09:48 +02:00
ec0ac720bf
wined3d: Make sure that lit doesn't return NaN.
2011-09-12 10:09:34 +02:00
d7fa599974
wined3d: Make the device parameter to wined3d_device_get_vs_consts_i() const.
2011-09-12 10:09:07 +02:00
098d30946d
wined3d: Make the device parameter to wined3d_device_get_vs_consts_b() const.
2011-09-12 10:09:03 +02:00
53bb382706
wined3d: Report more vertex texture formats.
2011-09-09 13:33:58 +02:00
5385e1b3df
wined3d: Make the device parameter to wined3d_device_get_vertex_shader() const.
2011-09-09 13:33:39 +02:00
31906458da
wined3d: Make the device parameter to wined3d_device_get_vertex_declaration() const.
2011-09-09 13:33:36 +02:00
bbb77cba74
wined3d: Add support for flipping compressed surfaces to surface_cpu_blt().
2011-09-09 13:33:33 +02:00
5c57b53a6c
wined3d: Use the CPU blitter for blitting to converted surfaces.
2011-09-09 13:33:25 +02:00
e82e1c2ac5
wined3d: Disable sRGB decoding in draw_textured_quad().
...
We're always supposed to draw the RGB texture here. sRGB decoding may be
enabled if sRGB decoding was enabled to last time the surface was used as a
texture, or if it was never used as a texture at all.
2011-09-09 13:33:22 +02:00
0affcc3a7d
wined3d: Remove dead code (and variable) from wined3d_surface_flip. wined3d_surface_flip.
2011-09-08 20:08:06 +02:00
20e9b3f13f
wined3d: Make the device parameter to wined3d_device_get_scissor_rect() const.
2011-09-08 11:11:27 +02:00
919d3ab9e4
wined3d: Make the device parameter to wined3d_device_get_sampler_state() const.
2011-09-08 11:11:24 +02:00
19da825b12
wined3d: Use draw_binding for the surface_modify_location() call in surface_unmap() as well.
2011-09-08 11:11:10 +02:00
33f087c95d
wined3d: Make the device parameter to wined3d_device_get_render_state() const.
2011-09-07 11:12:52 +02:00
b55dcfd35a
wined3d: Make the device parameter to wined3d_device_get_viewport() const.
2011-09-07 11:12:48 +02:00
79c438b2f2
wined3d: Implement wined3d_surface_flip() as a blit.
...
This allows us to actually take the "override" parameter into account. Plain
back -> front flips will be detected in wined3d_surface_flip() and will still
be handled by wined3d_swapchain_present().
2011-09-07 11:12:17 +02:00
cf010c563c
wined3d: Make the device parameter to wined3d_device_get_base_vertex_index() const.
2011-09-06 10:48:43 +02:00
cb82e57290
wined3d: Make the device parameter to wined3d_device_get_index_buffer() const.
2011-09-06 10:48:41 +02:00
1b9bc1a950
wined3d: Try doing a present in wined3d_surface_blt() instead of IWineD3DSurfaceImpl_BltOverride().
2011-09-06 10:48:36 +02:00
b86d69de16
wined3d: Don't override the swapchain present interval in IWineD3DSurfaceImpl_BltOverride().
2011-09-06 10:48:31 +02:00
9ae5d06e77
wined3d: Make the device parameter to wined3d_device_get_material() const.
2011-09-05 10:57:03 +02:00
23b4be9155
wined3d: Make the device parameter to wined3d_device_get_clip_status() const.
2011-09-05 10:57:00 +02:00
3346fc747c
wined3d: Get rid of the rect checks for present in IWineD3DSurfaceImpl_BltOverride().
2011-09-05 10:56:54 +02:00
74b418c9e0
wined3d: Don't print the GLSL info log by default on fglrx.
2011-09-05 10:56:46 +02:00
9425e1be83
wined3d: Add support for Nvidia GT 555M.
2011-09-02 18:28:25 +02:00
d23938de1e
wined3d: Make the device parameter to wined3d_device_get_clip_plane() const.
2011-09-02 10:09:08 +02:00
3659d5d729
wined3d: Make the device parameter to wined3d_device_get_light_enable() const.
2011-09-02 10:09:06 +02:00
ca69a23d52
wined3d: Get rid of some redundant else statements in IWineD3DSurfaceImpl_BltOverride().
2011-09-02 10:09:01 +02:00
179d6f8087
wined3d: Remove a redundant compare in IWineD3DSurfaceImpl_BltOverride().
...
If the source surface isn't on the destination swapchain it can't be a
backbuffer there either.
2011-09-02 10:08:57 +02:00
cc10600b52
wined3d: Print a FIXME for any flags passed to wined3d_surface_flip().
2011-09-02 10:08:53 +02:00
9d9baef789
wined3d: Make the device parameter to wined3d_device_get_light() const.
2011-09-01 18:06:37 +02:00
82150458b4
wined3d: Make the device parameter to wined3d_device_get_transform() const.
2011-09-01 18:06:37 +02:00
55ce85ad29
wined3d: Merge the wined3d_surface_flip() implementations.
2011-09-01 18:06:36 +02:00
b587b85394
wined3d: Merge the wined3d_surface_set_mem() implementations.
2011-09-01 18:06:36 +02:00
b2f7461a4d
wined3d: Remove an unused variable.
2011-09-01 18:06:36 +02:00
124cdf913a
wined3d: Make the device parameter to wined3d_device_get_stream_source_freq() const.
2011-08-31 19:43:05 +02:00
cfbecf9380
wined3d: Make the device parameter to wined3d_device_get_stream_source() const.
2011-08-31 19:43:05 +02:00
c89a3ffe80
ddraw: Get rid of the surface implementation switching code.
2011-08-31 19:42:52 +02:00
dd462052c6
wined3d: Use the resource size for copying between a surface's DIB and PBO.
2011-08-31 12:07:57 +02:00
7023964865
wined3d: Remove a useless NULL check (Coverity).
2011-08-30 17:27:25 +02:00
ef604e3826
wined3d: Add support for Nvidia GTX 460M.
2011-08-30 12:46:46 +02:00
094dd38b00
wined3d: Remove unneeded address-of operators from function names.
2011-08-30 11:56:48 +02:00
1870353c7a
wined3d: Replace "DirectDraw stuff" with per-adapter screen information.
2011-08-29 19:42:20 +02:00
e7f61b8c61
wined3d: Make the device parameter to wined3d_device_get_available_texture_mem() const.
2011-08-29 19:42:14 +02:00
e1f83fd205
wined3d: Make the device parameter to wined3d_device_get_wined3d() const.
2011-08-29 12:08:21 +02:00
2ff7a356d2
wined3d: Make the device parameter to wined3d_device_get_swapchain() const.
2011-08-29 12:08:21 +02:00
a3f23541c1
wined3d: Make the device parameter to wined3d_device_get_swapchain_count() const.
2011-08-29 12:08:21 +02:00
d5c2ba6d62
wined3d: Make the target parameter to is_full_clear() const.
2011-08-29 12:08:20 +02:00
78cbe0bc74
wined3d: Rename WineD3DAdapterChangeGLRam() to adapter_adjust_memory().
...
And make it work on an adapter instead of a device.
2011-08-29 12:08:20 +02:00
c74c544cc6
wined3d: Store maximum vertex attributes count.
2011-08-29 12:08:19 +02:00
afeecfd974
wined3d: Rename dummyTextureName variable.
2011-08-29 12:08:19 +02:00
7c6bd2f287
wined3d: Use dummy textures for all the texture targets.
2011-08-29 12:08:19 +02:00
0386b44bad
wined3d: Keep track of the current texture type for each texture unit.
2011-08-29 12:08:19 +02:00
8a2b435dd3
wined3d: Enable multisampling by default.
2011-08-26 11:28:50 +02:00
641f52ef96
wined3d: Add multisampling support.
2011-08-26 11:28:47 +02:00
bd5f948682
wined3d: Get rid of the current multisampling support.
...
It doesn't really work, and trying to make multisampling work with onscreen
rendering is probably more trouble than it's worth, both for us and the
driver.
2011-08-26 11:28:25 +02:00
eec2c634a6
wined3d: Introduce a separate function for attaching depth / stencil renderbuffers.
2011-08-26 11:28:01 +02:00
be76133b7b
wined3d: Explicitly specify the resource location to context_attach_depth_stencil_fbo().
2011-08-26 11:27:57 +02:00
9aaf0a30b7
wined3d: Also print an attachment's multisample type in context_check_fbo_status().
2011-08-26 11:27:53 +02:00
3b478afd10
wined3d: Get rid of the location fixup in surface_blt_fbo().
2011-08-26 11:27:50 +02:00
eac640532d
wined3d: Get rid of the location fixup for ORM_FBO in surface_modify_location().
2011-08-26 11:27:46 +02:00
68a5305dfd
wined3d: Get rid of the location fixup for ORM_FBO in surface_load_location().
2011-08-26 11:27:43 +02:00
98277e1fc6
wined3d: Simplify context_apply_fbo_state_blit().
2011-08-26 11:27:39 +02:00
36a22dfa33
wined3d: Don't change active texture to 0.
2011-08-25 11:31:55 +02:00
d485e04576
wined3d: Fetch currently active texture unit from the wined3d_context.
2011-08-25 11:31:55 +02:00
f47f9f7c74
wined3d: Store currently active texture in the wined3d context.
2011-08-25 11:31:55 +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
4503f3d5af
wined3d: Pass a gl_info pointer to select_blit_implementation().
2011-08-25 11:31:54 +02:00
9aa4f895f0
wined3d: Pass a gl_info pointer to select_shader_backend().
2011-08-25 11:31:54 +02:00
86af42a46a
wined3d: Pass a gl_info pointer to select_fragment_implementation().
2011-08-25 11:31:54 +02:00
f65a1ed272
wined3d: Bind the system framebuffer based on the actual location in context_apply_fbo_state().
...
We can do this now because SFLAG_INDRAWABLE is no longer ambiguous.
2011-08-25 11:31:54 +02:00
47c5711fe2
wined3d: Use draw_binding in context_apply_blit_state().
2011-08-25 11:31:54 +02:00
f0d8f2aa89
wined3d: Use draw_binding in swapchain_gl_present().
2011-08-25 11:31:53 +02:00
6cdfb95c8e
wined3d: Use draw_binding in surface_unload().
2011-08-25 11:31:53 +02:00
1d43f07239
wined3d: Use draw_binding in surface_realize_palette().
2011-08-25 11:31:53 +02:00
683b52ed92
wined3d: Use draw_binding in surface_unmap().
2011-08-25 11:31:53 +02:00
1ae498dc59
wined3d: Use draw_binding in IWineD3DSurfaceImpl_BltOverride().
2011-08-25 11:31:53 +02:00
e110c08cc8
wined3d: Avoid dereferencing null pointer in context_apply_clear_state when calling context_generate_rt_mask_from_surface.
2011-08-24 21:18:37 +02:00
f80301e3e6
wined3d: Make the gl_info parameter to wined3d_guess_gl_vendor() const.
2011-08-24 11:58:15 +02:00
a88611210f
wined3d: Make the ctx parameter to WineD3D_ReleaseFakeGLContext() const.
2011-08-24 11:58:15 +02:00
22f5d0081f
wined3d: Make the device parameter to drawStridedSlow() const.
2011-08-24 11:58:15 +02:00
4673330cf4
wined3d: Use draw_binding in wined3d_surface_blt().
2011-08-24 11:58:15 +02:00
99da66429b
wined3d: Use draw_binding in device_clear_render_targets().
2011-08-24 11:58:15 +02:00
317d76abb4
wined3d: Use draw_binding in arbfp_blit_surface().
2011-08-24 11:58:14 +02:00
e57b20c215
wined3d: Keep track of a surface's "draw location".
2011-08-24 11:58:14 +02:00
f73593c572
wined3d: Set the current location to SFLAG_INTEXTURE instead of SFLAG_INDRAWABLE in wined3d_surface_depth_blt().
...
These currently end up being the same thing, but that will change soon.
2011-08-24 11:58:14 +02:00
620c81dc76
wined3d: Add a registry key to disable rendering swapchains onscreen.
...
We'll probably want to make this default to TRUE at some point, but at least
for the moment there still seem to be some performance advantages to rendering
onscreen in most cases.
2011-08-24 11:58:14 +02:00
4b1ba0e02d
wined3d: Don't get rid of the user memory unless we're actually called with NULL in surface_set_mem().
...
In particular, some applications will call surface_set_mem() with the same
pointer to notify us the contents have changed.
2011-08-24 11:58:14 +02:00
2459d79b53
wined3d: Disable WINED3DFMT_S1_UINT_D15_UNORM and WINED3DFMT_S4X4_UINT_D24_UNORM.
2011-08-24 11:52:07 +02:00
5d1d07abcf
wined3d: Call glFlush after updating a buffer.
2011-08-24 11:52:06 +02:00
7d46943067
wined3d: Make some parameters to get_glsl_program_entry() const.
2011-08-23 16:53:52 +02:00
3b3470b151
wined3d: Make the shader parameter to shader_glsl_generate_vshader() const.
2011-08-23 16:53:52 +02:00
f75675031f
wined3d: Make the shader parameter to shader_glsl_generate_pshader() const.
2011-08-23 16:53:52 +02:00
9de5372036
wined3d: Introduce a function to update a swapchain's render_to_fbo field.
2011-08-23 16:53:51 +02:00
7b19efd9d5
wined3d: Just call resource_unload() in updateSurfaceDesc().
...
Instead of trying to duplicate the functionality.
2011-08-23 16:53:51 +02:00
b474225386
wined3d: Only delete the GL contexts after unloading resources in wined3d_device_reset().
...
The updateSurfaceDesc() calls potentially make GL calls.
2011-08-23 16:53:51 +02:00
9df014b9de
wined3d: Rename WineD3D_ChoosePixelFormat() to context_choose_pixel_format().
2011-08-23 16:53:51 +02:00
48911d7a1c
wined3d: Reject color blits on sysmem surfaces in ffp_blit_supported().
2011-08-23 16:53:51 +02:00
f58e55ec6c
wined3d: Move arbfp based color blits from IWineD3DSurfaceImpl_BltOverride() to wined3d_surface_blt().
2011-08-23 16:53:51 +02:00
c592d553f0
wined3d: Reject color blits on sysmem surfaces in arbfp_blit_supported().
2011-08-23 16:53:51 +02:00
0fc7cd5ad7
wined3d: Invalidate streamsrc, vdecl and indexbuffer after strided draws.
2011-08-22 19:49:39 +02:00
42a6455ea5
wined3d: Sync a function prototype with its definition.
2011-08-22 19:49:39 +02:00
342d2b8979
wined3d: Don't use the old depth-stencil surface after decrementing its ref count.
2011-08-22 17:22:48 +02:00
a04f0e9c78
wined3d: Move FBO based color blits from IWineD3DSurfaceImpl_BltOverride() to wined3d_surface_blt().
2011-08-22 16:14:37 +02:00
d063ff55e7
wined3d: Move surface_color_fill() based color fills from IWineD3DSurfaceImpl_BltOverride() to wined3d_surface_blt().
2011-08-22 16:14:37 +02:00
a887128ffd
wined3d: Reject color fills on sysmem surfaces in ffp_blit_supported().
2011-08-22 16:14:36 +02:00
18434ddc57
wined3d: Directly call surface_cpu_blt() in cpu_blit_color_fill().
...
And avoid a potential infinite recursion if wined3d_surface_blt() ends up
calling cpu_blit_color_fill().
2011-08-22 16:14:36 +02:00
26484c9200
wined3d: Allow color fills on FBO attachable surfaces in ffp_blit_supported().
2011-08-22 16:14:36 +02:00
e1ab5f6e6b
wined3d: Don't allow blits with an invalid destination rectangle when a clipper is set either.
...
Clippers don't really work. Previously we mostly didn't run into this because
the rectangle was already rejected by ddraw_surface7_Blt(), although
ddraw_surface7_BltFast() might have been affected in a couple of cases. We
should of course implement clippers, but until that happens, completely
rejecting the blit is better than introducing memory corruption.
This fixes a regression introduced by commit
92e616f355
2011-08-22 16:14:36 +02:00
f8ce77a598
wined3d: Draw buffers are per-framebuffer state.
2011-08-22 16:14:36 +02:00
34b2956e23
wined3d: Merge FindContext() into context_acquire().
...
This actually fixes a bug. A context's current_rt field may get set to NULL if
that surface gets destroyed or unloaded. In general, the next time that
context is acquired, context_setup_target() will then set everything up again.
However, if a context_acquire() call with a NULL target ends up returning such
a context, context_setup_target() never sets the current_rt field because the
target FindContext() chooses never gets propagated to context_acquire(). This
patch ensures context_setup_target() is never called with a NULL target.
2011-08-22 16:14:36 +02:00
56428c6386
wined3d: Reuse convert_a8r8g8b8_x8r8g8b8() for B8G8R8X8 -> B8G8R8A8 conversions.
2011-08-22 16:14:36 +02:00
156d24c634
wined3d: Add compressed surface support to surface_cpu_blt().
2011-08-22 16:14:36 +02:00
0e043819f4
wined3d: Add support for Nvidia GTX 550/560 Ti.
2011-08-05 16:43:24 +02:00
812a314821
wined3d: Get rid of the fglrx point sprite hack.
...
Fglrx 9.3 is well over 2 years old at this point. I'd strongly encourage
anyone still affected by this to upgrade to the r300g driver.
2011-08-05 09:17:59 +02:00
293bf961ed
wined3d: Pass a non-NULL rectangle to surface_color_fill() in wined3d_device_clear_rendertarget_view().
2011-08-05 09:17:51 +02:00
7e8e7ecebb
wined3d: Always pass a non-NULL rectangle to surface_color_fill() in wined3d_device_color_fill().
2011-08-05 09:17:47 +02:00
a84275075d
wined3d: Implement wined3d_surface_bltfast() on top of wined3d_surface_blt().
2011-08-05 09:17:39 +02:00
662de19ad3
wined3d: Move some flags handling from surface_cpu_blt() to wined3d_surface_blt().
2011-08-04 09:04:49 +02:00
7e3ecd683c
wined3d: Move rectangle validation from surface_cpu_blt() to wined3d_surface_blt().
...
This fixes some tests because these were getting skipped for the BltOverride() path.
2011-08-04 09:04:39 +02:00
b166cb29f8
wined3d: Remove src_rect and dst_rect NULL checks from surface_cpu_blt().
2011-08-04 09:04:25 +02:00
e74d1358ac
wined3d: Remove the unused blit_op parameter to arbfp_blit_surface().
2011-08-04 09:04:20 +02:00
7e309601f3
dlls: Assorted spelling fixes.
2011-08-03 14:15:50 +02:00
41cff1618c
wined3d: Merge wined3d_surface_blt(), surface_blt() and gdi_surface_blt().
2011-08-03 09:23:30 +02:00
c12627562b
wined3d: Go to the fallbacks for cross-swapchain blits.
2011-08-03 09:23:20 +02:00
111e8fe77c
wined3d: Add WINED3DFMT_P8_UINT support to wined3d_format_convert_from_float().
2011-08-03 09:23:16 +02:00
cf1c641cbb
wined3d: Fix switching color keying on / off.
2011-08-03 09:23:12 +02:00
e4efcea223
wined3d: Set the read buffer to GL_NONE in surface_load_ds_location().
...
On GL implementations that don't support GL_ARB_ES2_compatibility the
framebuffer's read buffer has to be valid, even if we're not reading from it.
2011-08-03 09:23:08 +02:00
98650e841e
wined3d: Go to the fallbacks if D3D is not initialized in surface_blt().
...
Even though this is the "OpenGL" surface implementation, this can still happen
in e.g. ddraw if no swapchain is created yet. That's something we should fix,
but not today.
2011-08-02 11:40:20 +02:00
7539cc8faa
wined3d: Go straight to the fallbacks for complex blits in surface_blt().
...
At the moment this is only marginally useful, since it just avoids silly
things like color keyed depth fills that are probably invalid anyway. However,
the idea is to gradually move normal color fill and blit handling out of
IWineD3DSurfaceImpl_BltOverride() and surface_cpu_blt(), and eventually make
those functions go away completely.
2011-08-02 11:40:16 +02:00
4bdd4ef45b
wined3d: Check for locked surfaces in wined3d_surface_blt().
2011-08-02 11:40:11 +02:00
50d883c37e
wined3d: IWineD3DSurfaceImpl_BltOverride() is always passed valid source and destination rectangles.
...
So no need to call surface_get_rect() anymore.
2011-08-02 11:40:07 +02:00
ace241ad59
wined3d: Resolve source and destination rectangles in wined3d_surface_blt().
2011-08-02 11:40:01 +02:00
33fafc6166
wined3d: Get rid of context_bind_fbo() calls outside context.c.
2011-08-01 11:16:12 +02:00
dcc969c32c
wined3d: Get rid of dst_fbo.
...
As a result we can get rid of a couple of other things as well.
2011-08-01 11:16:08 +02:00
ccb3a51a44
wined3d: Just invalidate STATE_FRAMEBUFFER in surface_load_ds_location().
2011-08-01 11:16:03 +02:00
4428bda4a1
wined3d: Apply clear state after depth / stencil setup in device_clear_render_targets().
2011-08-01 11:15:59 +02:00
03eb6a4aa6
wined3d: Apply draw state after depth / stencil setup in drawPrimitive().
2011-08-01 11:15:55 +02:00
64f71fda6d
wined3d: Complain about users disabling GLSL.
2011-07-29 12:11:01 +02:00
2256a7e804
wined3d: wined3d_device_evict_managed_resources() doesn't need a return value.
2011-07-29 12:09:39 +02:00
3d7c596cdc
wined3d: Don't hide GL function pointer typedefs behind extension defines.
...
These are specific to wined3d.
2011-07-29 12:09:26 +02:00
7bc0032878
wined3d: Recognize some more AMD cards.
2011-07-29 12:09:22 +02:00
b06e32184b
wined3d: Only invalidate state for the current context in wined3d_buffer_unmap().
2011-07-29 12:09:17 +02:00
41f9ca2abf
wined3d: Restore the call to context_validate_onscreen_formats.
...
This got lost accidentally in d321959dd7
2011-07-28 11:29:52 +02:00
487cc9729b
wined3d: Only invalidate state for the current context in wined3d_buffer_map().
2011-07-28 11:29:27 +02:00
cc2dc5b0c8
wined3d: Only invalidate state for the current context in wined3d_device_set_cursor_properties().
2011-07-28 11:29:24 +02:00
a1ba5b5131
wined3d: Only invalidate state for the current context in device_clear_render_targets().
2011-07-28 11:29:21 +02:00
7e3f85cab6
wined3d: Only invalidate state for the current context in tesselate_rectpatch().
2011-07-28 11:29:18 +02:00
2bf020e26f
wined3d: Only invalidate state for the current context in surface_blt_fbo().
2011-07-28 11:29:14 +02:00
51c0f2a787
wined3d: Only invalidate state for the current context in wined3d_surface_depth_blt_fbo().
2011-07-27 11:51:53 +02:00
c2ede1d4c8
wined3d: Only invalidate state for the current context in swapchain_blit().
2011-07-27 11:51:50 +02:00
68d692f49c
wined3d: Get rid of the redundant state_table parameter to context_invalidate_state().
2011-07-27 11:51:46 +02:00
26cd7b835d
wined3d: Get rid of the use_vshader parameter to device_stream_info_from_declaration().
2011-07-27 11:51:41 +02:00
bd1429e248
wined3d: Introduce a "state" variable in device_stream_info_from_declaration().
2011-07-27 11:51:34 +02:00
1195530795
wined3d: Release the onscreen depth / stencil reference on reset.
...
No need to save the contents, after a reset it's all undefined anyway.
2011-07-25 21:25:24 +02:00
27b20bac43
wined3d: Unbind all textures in wined3d_device_reset().
2011-07-25 21:25:19 +02:00
44e109debe
wined3d: Unbind resources inside wined3d_device_reset().
2011-07-25 21:25:15 +02:00
c84112f86f
wined3d: Get rid of wined3d_device_enum_resources().
2011-07-25 21:25:11 +02:00
0739cae273
wined3d: Pass "reset_enum_callback" directly to wined3d_device_reset().
...
It would have been nice if we could do all of this inside wined3d, but we need
to determine what resources are in use by d3d8/d3d9, not wined3d. This is
mostly an issue for "implicit" resources like swapchain render targets and the
depth / stencil surface. The fact that we're having this problem probably
means we're doing it wrong. Since these implicit resources should only be
referenced by wined3d, we could probably just destroy and recreate the
swapchain, instead of the little updateSurfaceDesc() dance we currently do.
2011-07-25 21:25:01 +02:00
b09b7e323c
wined3d: Store a pointer to the state table in the context.
2011-07-25 11:59:15 +02:00
68b9071329
wined3d: Make the shader and ctx_priv parameters to shader_generate_glsl_declarations() const.
2011-07-25 11:59:11 +02:00
6a046eddd7
wined3d: Get rid of the vpos_uniform field from the wined3d_pixel_shader structure.
2011-07-25 11:59:07 +02:00
43d2515da5
wined3d: Use the "rts" variable in context_apply_clear_state().
2011-07-25 11:59:04 +02:00
e5036e365e
wined3d: Use gl_info from the context in context_apply_clear_state().
2011-07-25 11:58:59 +02:00
dbcbf0c45b
wined3d: Make the heap parameter to update_heap_entry() const.
2011-07-22 12:57:20 +02:00
959874c2d8
wined3d: Make the tex_unit_map parameter to shader_glsl_load_vsamplers() const.
2011-07-22 12:57:19 +02:00
86dd8476db
wined3d: Make the tex_unit_map parameter to shader_glsl_load_psamplers() const.
2011-07-22 12:57:19 +02:00
f99a2748e4
wined3d: Don't apply and invalidate the framebuffer when clearing the device's fb.
2011-07-20 19:23:05 +02:00
6ffd066834
wined3d: Make the query parameter to wined3d_event_query_finish() const.
2011-07-19 14:06:05 +02:00
2e636aae29
wined3d: Make the query parameter to wined3d_event_query_test() const.
2011-07-19 14:06:03 +02:00
c6c76f5a1a
wined3d: Make the priv parameter to map_register() const.
2011-07-19 14:06:01 +02:00
c5f8a33a86
wined3d: Make the surface parameter to ffp_blit_p8_upload_palette() const.
2011-07-19 14:05:59 +02:00
437cec1a49
wined3d: Make the surface parameter to surface_depth_blt() const.
2011-07-18 16:23:29 +02:00
a97ed53460
wined3d: Make the surface parameter to surface_convert_color_to_float() const.
2011-07-18 16:23:29 +02:00
d314aa2d6e
wined3d: Make the surface parameter to surface_convert_depth_to_float() const.
2011-07-18 16:23:29 +02:00
416a55c7aa
wined3d: Make the surface parameter to surface_is_full_rect() const.
2011-07-18 16:23:29 +02:00
db12216301
wined3d: Make the surface parameter to surface_get_rect() const.
2011-07-18 16:23:29 +02:00
2b789778fd
wined3d: Make the swapchain parameter to swapchain_blit() const.
2011-07-15 10:08:21 +02:00
2e14d9ac0e
wined3d: Make the texture parameter to texture_srgb_mode() const.
2011-07-15 10:08:18 +02:00
dd2f2c40f0
wined3d: Get rid of the useext macro.
...
This does nothing, since we have our own GL header.
2011-07-15 10:08:14 +02:00
7ee4bda63e
wined3d: Add stream offsets in device_stream_info_from_declaration().
...
They're not going to change until the next time the stream info is updated.
This would of course mainly be useful if we managed to do more than one or two
draws with the same stream info.
2011-07-15 10:08:02 +02:00
cf421e1b3f
wined3d: Don't set GL_MAP_UNSYNCHRONIZED_BIT for WINED3D_BUFFER_DISCARD maps.
...
WINED3D_BUFFER_DISCARD means the (current) buffer contents are undefined for
subsequent operations. I.e., the map doesn't have to wait for any pending
operations to finish, and can just return a new buffer with undefined
contents. GL_MAP_UNSYNCHRONIZED_BIT means the driver doesn't wait for previous
operations to finish, and just maps a buffer that's potentially in use. Proper
synchronization is left to the application. Note that we set both
GL_MAP_INVALIDATE_BUFFER_BIT and GL_MAP_UNSYNCHRONIZED_BIT.
GL_MAP_INVALIDATE_BUFFER_BIT corresponds to WINED3D_BUFFER_DISCARD, and might
cause the driver to return a new buffer, but it's not required to make that
optimization.
2011-07-15 10:07:41 +02:00
e4d2d78500
wined3d: Pass a wined3d_state pointer to state handlers.
...
Instead of an entire stateblock. This is mainly useful is we ever want to call
state handlers on state not stored in a stateblock.
2011-07-14 14:11:25 +02:00
9375a87c86
wined3d: Make the context and device parameters to find_draw_buffers_mask() const.
2011-07-14 14:11:21 +02:00
565fcbdfb8
wined3d: Get rid of the clip status code.
...
I'm pretty sure this is just broken, and I'm not aware of any application
using this.
2011-07-14 14:11:18 +02:00
5e83efa1b2
wined3d: Remove the unused untransformed field from struct wined3d_device.
2011-07-14 14:11:11 +02:00
fcf4303e1a
wined3d: Store a pointer to the framebuffer state in struct wined3d_state.
2011-07-14 14:11:07 +02:00
475225c275
wined3d: Pass a state pointer instead of a stateblock to loadVertexData().
2011-07-13 11:52:04 +02:00
534151a79b
wined3d: Pass a state pointer instead of a stateblock to loadTexCoords().
2011-07-13 11:51:58 +02:00
3d28cdb691
wined3d: Pass a state pointer instead of a stateblock to loadNumberedArrays().
2011-07-13 11:51:55 +02:00
b2d32a4966
wined3d: Make the volume parameter to volume_load() const.
2011-07-13 11:51:52 +02:00
1791a5afd5
wined3d: Make the volume parameter to volume_bind_and_dirtify() const.
2011-07-13 11:51:49 +02:00
d67d7ebbcb
wined3d: Make the shader parameter to shader_generate_main() const.
2011-07-12 11:35:12 +02:00
48881c0792
wined3d: Make the shader parameter to vshader_get_input() const.
2011-07-12 11:35:08 +02:00
a86785d065
wined3d: Make the swapchain parameter to x11_copy_to_screen() const.
2011-07-12 11:35:05 +02:00
d1b650e959
wined3d: Explicitly pass gl_info to gen_arbfp_ffp_shader().
2011-07-12 11:34:58 +02:00
1f6f94675e
wined3d: Only use state contained in the ffp_frag_settings structure in gen_arbfp_ffp_shader().
...
Note that the actual check looks off by one too.
2011-07-12 11:34:55 +02:00
c5d457c8b4
wined3d: Store a struct wined3d_bo_address in struct wined3d_stream_info_element.
...
Instead of using separate fields for the buffer object and offset.
2011-07-11 11:53:42 +02:00
89bf30a25e
wined3d: Return data as struct wined3d_bo_address in buffer_get_memory().
2011-07-11 11:53:39 +02:00
a3538a1546
wined3d: Store VBO addresses in a struct wined3d_bo_address in device_stream_info_from_declaration().
2011-07-11 11:53:35 +02:00
abfd6b479a
wined3d: Make the surface parameter to d3dfmt_p8_init_palette() const.
2011-07-11 11:53:32 +02:00
3e9930f307
wined3d: Make the device parameter to primary_render_target_is_p8() const.
2011-07-11 11:53:28 +02:00
6c5e109af7
wined3d: Introduce quirk for proper RGBA16 support.
2011-07-09 11:48:15 +02:00
a26c5f9b13
wined3d: Make the surface parameter to d3dfmt_get_conv() const.
2011-07-08 11:25:31 +02:00
aa55404682
wined3d: Make the src_surface parameter to draw_textured_quad() const.
2011-07-08 11:25:28 +02:00
0d18f5df0e
wined3d: Make the surface parameter to surface_upload_data() const.
2011-07-08 11:25:25 +02:00
faebcc0236
wined3d: Make the surface parameter to surface_translate_drawable_coords() const.
2011-07-08 11:25:21 +02:00
bb4b86f365
wined3d: Make the rt parameter to surface_set_compatible_renderbuffer() const.
2011-07-08 11:25:17 +02:00
640234c504
wined3d: Rename "flag" to "location" in surface_modify_location().
2011-07-07 12:31:46 +02:00
67724d9f70
wined3d: Make the surface parameter to surface_get_texture_name() const.
2011-07-07 12:31:42 +02:00
bec379e411
wined3d: Make the current_renderbuffer field in struct wined3d_surface const.
2011-07-07 12:31:38 +02:00
4671f86cd6
wined3d: Make the context parameter to the get_drawable_size() callback const.
2011-07-07 12:31:34 +02:00
0a5b56083d
wined3d: Make the device parameter to device_preload_textures() const.
2011-07-07 12:31:30 +02:00
9d3cc8b012
wined3d: Make dummy textures black.
2011-07-06 19:38:46 +02:00
c0aa053a87
wined3d: Pass a state pointer instead of a device pointer to device_get_draw_rect().
2011-07-06 11:14:38 +02:00
a7120866be
wined3d: Remove the unused currentPatch field from struct wined3d_device.
2011-07-06 11:14:33 +02:00
0df3db37ac
wined3d: Explicitly pass device and state to gen_ffp_frag_op().
2011-07-06 11:14:29 +02:00
3ccf12a77c
wined3d: Rename "flag" to "location" in surface_load_location().
...
This makes much more sense.
2011-07-06 11:14:20 +02:00
590505c0a4
wined3d: Make context_create() work if the window is already destroyed.
2011-07-06 11:14:16 +02:00
f6600263c1
wined3d: Delete cursor texture on device reset.
2011-07-05 19:27:53 +02:00
718c614937
wined3d: Pass a struct wined3d_fb_state * to context_apply_clear_state.
2011-07-05 17:33:56 +02:00
053071e343
wined3d: Pass a struct wined3d_fb_state to device_clear_render_targets.
2011-07-05 17:33:51 +02:00
cd96c59d91
wined3d: Track framebuffer changes.
2011-07-05 17:33:43 +02:00
d321959dd7
wined3d: Move FBO application into a state handler.
2011-07-05 17:33:35 +02:00
1aa85c96a9
wined3d: Rename the rt mask generation functions.
2011-07-05 17:33:22 +02:00
4e8c7f00f2
wined3d: Print an ERR for unknown / invalid surface locations in surface_load_location().
2011-07-05 13:46:24 +02:00
1c3b691f10
wined3d: Introduce a separate function for loading the SFLAG_INTEXTURE and SFLAG_INSRGBTEX surface locations.
2011-07-05 13:46:20 +02:00
cabcb362c1
wined3d: Introduce a separate function for loading the SFLAG_INDRAWABLE surface location.
2011-07-05 13:46:15 +02:00
aacd8f8b93
wined3d: Introduce a separate function for loading the SFLAG_INSYSMEM surface location.
2011-07-05 13:46:11 +02:00
ddc29c40e6
wined3d: Make D3DRS_ZBIAS work.
...
D3DRS_ZBIAS is poorly defined, but it makes sense that the bias should be
format independent. Looking at application behaviour, it seems to include a
slope scale factor as well. This fixes a couple of regressions introduced by
96b758f7b3
2011-07-05 13:46:07 +02:00
a7c1b5f02e
wined3d: Remove dead code (clang).
2011-07-04 19:06:51 +02:00
5d6f29818f
wined3d: Get rid of the GL_SupportedExt typedef.
2011-07-04 13:44:52 +02:00
Henri Verbeet