Commit Graph

5584 Commits

Author SHA1 Message Date
Henri Verbeet b57d1e7c33 wined3d: Don't call surface_init_sysmem() on surfaces with a PBO. 2011-12-21 10:14:37 +01:00
Henri Verbeet 3082c1a9de wined3d: Get rid of the WINED3DRENDERSTATETYPE typedef. 2011-12-20 10:11:47 +01:00
Henri Verbeet 5bddd4427d wined3d: Get rid of the WINED3DDEGREETYPE typedef. 2011-12-20 10:11:39 +01:00
Henri Verbeet 969f3be73f wined3d: Get rid of the WINED3DBLENDOP typedef. 2011-12-19 20:15:49 +01:00
Henri Verbeet b39125d2f0 wined3d: Get rid of the WINED3DBLEND typedef. 2011-12-19 20:15:49 +01:00
Henri Verbeet 67bca436ee wined3d: Get rid of the WINED3DDEVTYPE typedef. 2011-12-13 18:58:58 +01:00
Henri Verbeet ebb85da5f7 wined3d: Get rid of the WINEDDCAPS typedef. 2011-12-13 18:58:58 +01:00
Henri Verbeet 943fcb0fc4 wined3d: Use the correct source pitch and byte_count for uploading converted surfaces. 2011-12-13 18:58:57 +01:00
Henri Verbeet e6fb4537f0 ddraw: Move clipper handling to ddraw. 2011-12-13 18:58:37 +01:00
Matteo Bruni 68e0cd430f wined3d: Ignore invalid texture transform flags. 2011-12-13 14:00:24 +01:00
Matteo Bruni fdd4df446f wined3d: Fix some flag checks. 2011-12-13 14:00:24 +01:00
Henri Verbeet e6a4a86608 wined3d: Get rid of the WINED3DPRIMITIVETYPE typedef. 2011-12-12 10:21:01 +01:00
Henri Verbeet b55b683b08 wined3d: Get rid of the WINED3DLIGHTTYPE typedef. 2011-12-12 10:20:57 +01:00
Henri Verbeet d806c37b4a wined3d: Trace all swapchain_desc fields in wined3d_device_reset(). 2011-12-12 10:20:52 +01:00
Henri Verbeet 38c3cde6fd wined3d: Get rid of the WINED3DPSHADERCAPS2_0 typedef. 2011-12-09 21:15:25 +01:00
Henri Verbeet af6b98c44b wined3d: Get rid of the WINED3DVSHADERCAPS2_0 typedef. 2011-12-09 21:15:24 +01:00
Henri Verbeet f3afa69f8d wined3d: Introduce a helper function for checking colors against a color key. 2011-12-09 21:15:24 +01:00
Henri Verbeet d2ca44a597 wined3d: Print the GL_RENDERER string when no "card selector" is available in wined3d_guess_card(). 2011-12-09 21:15:24 +01:00
Henri Verbeet 11efbbf140 wined3d: The VertexAttrib*h[v] calls in NV_half_float depend on NV_vertex_program.
Based on a patch by Aurélien Couderc.
2011-12-09 21:15:23 +01:00
Henri Verbeet 3dd03f642d wined3d: Get rid of the WINEDDCOLORKEY typedef. 2011-12-08 10:27:53 +01:00
Henri Verbeet 52231bc467 wined3d: Get rid of the WineDirect3DVertexStridedData typedef. 2011-12-08 10:27:50 +01:00
Henri Verbeet ada8ad76b9 wined3d: Avoid clearing the current wined3d context in WineD3D_CreateFakeGLContext().
There should be no need to clear the thread's current wined3d context as long
as we properly restore the corresponding GL stuff. This avoids hitting the
context restore code in context_enter() when we have e.g. two d3d9 devices,
one of which is inactive, because now we can see that the GL context that's
active belongs to another wined3d context, and we don't need to bother
saving and restoring it.
2011-12-08 10:27:40 +01:00
Henri Verbeet 2d1a941b7d wined3d: Properly check if a surface has a DIB section in gdi_surface_map(). 2011-12-08 10:27:32 +01:00
Henri Verbeet 56e3e05e57 wined3d: Read the PBO back into the DIB section if we have one in surface_remove_pbo(). 2011-12-08 10:27:29 +01:00
Henri Verbeet 4c3dfa1bca wined3d: Get rid of the WineDirect3DStridedData typedef. 2011-12-07 17:49:56 +01:00
Henri Verbeet 5c5216e609 wined3d: Get rid of the WINED3DBOX typedef. 2011-12-07 17:49:56 +01:00
Henri Verbeet 3f455832a3 wined3d: Unbind stateblock resources in wined3d_device_uninit_3d(). 2011-12-07 17:49:55 +01:00
Stefan Dösinger 6c423b106f wined3d: Remove the Apple NV_texture_shader quirk. 2011-12-06 17:06:53 +01:00
Stefan Dösinger e4f91774ac wined3d: Remove fglrx GLSL constant quirks.
Fglrx does not support r500 and earlier GPUs any longer, making those
quirks obsolete and a problem for r300g.
2011-12-06 17:06:49 +01:00
Henri Verbeet 2fa5a22100 wined3d: Get rid of the WINED3DLOCKED_BOX typedef. 2011-12-06 15:50:58 +01:00
Henri Verbeet eafebc0491 wined3d: Get rid of the WINED3DLOCKED_RECT typedef. 2011-12-06 15:50:58 +01:00
Henri Verbeet 107369d018 wined3d: Disable client storage in upload_palette().
Stack pointers don't work so well with client storage.
2011-12-06 15:50:58 +01:00
Henri Verbeet 66d453ce5c wined3d: Don't declare more varyings than required by the shader model. 2011-12-06 15:50:58 +01:00
Henri Verbeet c43aa1ada8 wined3d: Only unload the surface when we're using GL for rendering in updateSurfaceDesc(). 2011-12-05 12:23:05 +01:00
Henri Verbeet 31bf03d8a1 wined3d: Only recreate GL contexts when we're using GL for rendering in wined3d_device_reset(). 2011-12-05 12:23:02 +01:00
Henri Verbeet df446ae4fe wined3d: Create the device state block when the device is created. 2011-12-05 12:22:58 +01:00
Henri Verbeet 360c1114d6 wined3d: Get rid of the WINED3DRASTER_STATUS typedef. 2011-12-02 11:51:33 +01:00
Henri Verbeet 94c9b0b4fc wined3d: Get rid of the WINED3DPRESENT_PARAMETERS typedef. 2011-12-02 11:51:29 +01:00
Henri Verbeet 94c0da184e wined3d: Create a PBO in surface_load_location() even if SFLAG_INSYSMEM is already set.
In the longer term, sysmem and pbo should be separate resource locations.
2011-12-01 10:06:12 +01:00
Henri Verbeet 39ebb992f7 wined3d: Introduce a separate function to determine if a surface needs a PBO. 2011-12-01 10:06:07 +01:00
Henri Verbeet 4a7cbba0ea wined3d: Move the surface map counting code to wined3d_surface_map(). 2011-12-01 10:06:02 +01:00
Henri Verbeet 3a2921c559 ddraw: Keep the primary surface mapped at the same address for early ddraw versions. 2011-11-30 11:50:58 +01:00
Henri Verbeet 3430e11605 wined3d: Add a flags parameter to wined3d_surface_create(). 2011-11-30 11:50:48 +01:00
Henri Verbeet 82dd612d50 ddraw: Resize the swapchain window on mode changes in exclusive mode. 2011-11-30 11:50:42 +01:00
Henri Verbeet ab73f20e38 wined3d: Use proper texcoord masks for GLSL texm3x3spec / texm3x3vspec. 2011-11-29 13:23:04 +01:00
Francois Gouget 51a256e65f Assorted spelling fixes and wording tweaks. 2011-11-28 16:40:50 +01:00
Henri Verbeet f5a2670689 wined3d: Store the device type only once. 2011-11-28 16:40:47 +01:00
Henri Verbeet d1327bbefe wined3d: Get rid of the WINED3DDEVICE_CREATION_PARAMETERS typedef. 2011-11-28 16:40:47 +01:00
Henri Verbeet 6a529e5847 wined3d: Get rid of the WINED3DVERTEXELEMENT typedef. 2011-11-25 16:21:57 +01:00
Henri Verbeet 1c74172a28 wined3d: Get rid of the WINED3DCLIPSTATUS typedef. 2011-11-25 16:21:57 +01:00
Henri Verbeet 094f64c823 wined3d: Handle changing the backbuffer format in wined3d_device_reset(). 2011-11-25 16:21:57 +01:00
Henri Verbeet f51bf61d2f wined3d: Use the correct backbuffer format in wined3d_device_reset(). 2011-11-25 16:21:56 +01:00
Henri Verbeet 24775459c8 wined3d: Don't apply fixups to converted surfaces. 2011-11-25 16:21:56 +01:00
Henri Verbeet 376ffdf3d5 wined3d: Get rid of the WINED3DADAPTER_IDENTIFIER typedef. 2011-11-24 17:10:09 +01:00
Henri Verbeet 2fb21e0a2e wined3d: Get rid of the WINED3DTRIPATCH_INFO typedef. 2011-11-24 17:10:06 +01:00
Henri Verbeet 0acd48d89f wined3d: Trace the minimum buffer map alignment in wined3d_adapter_init_gl_caps().
There's not much else we need to do for ARB_map_buffer_alignment. There's
still a pretty decent chance that we'll get lucky with alignment even on
drivers that don't support the extension, since mmap is going to return page
aligned memory. Tiny buffers might get packed together in a page though.
2011-11-24 17:10:03 +01:00
Henri Verbeet 2ecbe2aa0f wined3d: Get rid of the WINED3DRECTPATCH_INFO typedef. 2011-11-23 09:13:58 +01:00
Henri Verbeet 7416953e81 wined3d: Get rid of the WINED3DLINEPATTERN typedef. 2011-11-23 09:13:54 +01:00
Henri Verbeet 08e8b0a70a wined3d: Don't return a surface for a NULL dc in wined3d_device_get_surface_from_dc(). 2011-11-23 09:13:44 +01:00
Henri Verbeet a8504f4f57 wined3d: Remove the special case for loop and rep in shader_get_registers_used().
SM4 loops don't have control parameters.
2011-11-23 09:13:33 +01:00
Matteo Bruni 1ac60004dc wined3d: Update sRGB GL texture state. 2011-11-23 09:13:21 +01:00
Henri Verbeet 2e1c0d83c1 wined3d: Get rid of the WINED3DGAMMARAMP typedef. 2011-11-22 10:52:45 +01:00
Henri Verbeet be8917cd91 wined3d: Get rid of the WINED3DVIEWPORT typedef. 2011-11-22 10:52:40 +01:00
Henri Verbeet 14cf780fde wined3d: Recognize the SM4 xor opcode. 2011-11-22 10:52:33 +01:00
Henri Verbeet d695dd3af4 wined3d: Recognize the SM4 ushr opcode. 2011-11-22 10:52:29 +01:00
Henri Verbeet 9afff037e5 wined3d: Recognize the SM4 udiv opcode. 2011-11-22 10:52:25 +01:00
Henri Verbeet 02bb70fc3b wined3d: Get rid of the WINED3DMATERIAL typedef. 2011-11-21 11:01:02 +01:00
Henri Verbeet f597359727 wined3d: Get rid of the WINED3DLIGHT typedef. 2011-11-21 11:00:57 +01:00
Henri Verbeet e2d099a14d wined3d: Recognize the SM4 round_ni opcode. 2011-11-21 11:00:50 +01:00
Henri Verbeet 829e28cb4d wined3d: Recognize the SM4 ge opcode. 2011-11-21 11:00:46 +01:00
Henri Verbeet af11214562 wined3d: Recognize the SM4 eq opcode. 2011-11-21 11:00:42 +01:00
Henri Verbeet 37a0f7ad65 wined3d: Get rid of the WINED3DMATRIX typedef. 2011-11-18 14:26:16 +01:00
Henri Verbeet 8dd50e9a20 wined3d: Recognize the SM4 deriv_rty opcode. 2011-11-18 14:26:16 +01:00
Henri Verbeet 9ef669e80a wined3d: Recognize the SM4 deriv_rtx opcode. 2011-11-18 14:26:15 +01:00
Francois Gouget 54bcda10e5 wined3d: Delete the static critical sections when unloading the dll. 2011-11-17 11:38:08 +01:00
Henri Verbeet 18a7653c78 wined3d: Get rid of the WINED3DDISPLAYMODE typedef. 2011-11-17 11:37:26 +01:00
Henri Verbeet e0a0d611af wined3d: Pass a wined3d_color struct to wined3d_device_clear(). 2011-11-16 09:41:53 +01:00
Henri Verbeet 7459180a51 wined3d: Get rid of the WINED3DCOLORVALUE typedef. 2011-11-16 09:41:50 +01:00
Matteo Bruni 151cf2696b wined3d: Disable WINED3DFMT_B8G8R8_UNORM. 2011-11-15 19:37:37 +01:00
Matteo Bruni 1fd18d7688 wined3d: Make a copy of gl_info for later context_destroy_gl_resources() usage. 2011-11-15 19:37:36 +01:00
Henri Verbeet e43a185c17 wined3d: Get rid of the WINED3DSHADER_PARAM_DSTMOD_TYPE typedef. 2011-11-15 16:09:09 +01:00
Henri Verbeet 563edce2fa wined3d: Get rid of the WINED3DSHADER_PARAM_SRCMOD_TYPE typedef. 2011-11-15 16:09:09 +01:00
Matteo Bruni 62a2ad3d0f wined3d: Skip blending test on some texture formats.
It doesn't make sense to test NULL and P8, while the luminance formats
right now aren't really tested anyway (and "incidentally" that also
workarounds a Nvidia drivers bug).
2011-11-14 15:25:24 +01:00
Matteo Bruni 56c9952ee6 wined3d: Fix post-pixelshader blending test. 2011-11-14 15:25:24 +01:00
Henri Verbeet 076edfe9d4 wined3d: Get rid of the winetexturestates typedef. 2011-11-14 15:25:22 +01:00
Henri Verbeet 66cb4a8ca9 wined3d: Get rid of the WINED3DSHADER_PARAM_REGISTER_TYPE typedef. 2011-11-14 15:25:22 +01:00
Henri Verbeet 13efdc6a37 wined3d: Introduce a "state" variable in shader_glsl_load_constants(). 2011-11-14 15:25:22 +01:00
Henri Verbeet a44401af0f wined3d: x11_copy_to_screen() shouldn't be called on mapped surfaces. 2011-11-14 15:25:21 +01:00
Henri Verbeet adf7c33023 wined3d: Get rid of the COMPARISON_TYPE typedef. 2011-11-09 11:34:32 +01:00
Henri Verbeet 323a95418e wined3d: Get rid of the WINED3DSAMPLER_TEXTURE_TYPE typedef. 2011-11-09 11:34:24 +01:00
Henri Verbeet 81ae0cea7c wined3d: Simplify context_choose_pixel_format().
Simply rank the formats instead of doing multiple passes over the list.
2011-11-09 11:34:19 +01:00
Henri Verbeet 0ba5f7dd98 wined3d: Get rid of RTL_DISABLE. 2011-11-09 11:34:11 +01:00
Henri Verbeet b6c7a3dbc8 wined3d: Don't print FIXMEs for misaligned surface maps. 2011-11-09 11:34:04 +01:00
Henri Verbeet 4c727ed0a1 wined3d: Get rid of the SAVEDSTATES typedef. 2011-11-08 09:50:31 +01:00
Henri Verbeet 1e1c442aca wined3d: Get rid of the wineD3DSurface_DIB typedef. 2011-11-08 09:50:28 +01:00
Henri Verbeet d6b432b068 wined3d: Get rid of client_memory from wineD3DSurface_DIB. 2011-11-08 09:50:23 +01:00
Henri Verbeet 896aaa67ca wined3d: Get rid of holdbitmap from wineD3DSurface_DIB. 2011-11-08 09:50:18 +01:00
Henri Verbeet 604d154002 wined3d: Only report a broken pitch in wined3d_surface_map().
We'd like the correct pitch for internal calls to wined3d_surface_get_pitch().
2011-11-08 09:50:13 +01:00
Stefan Dösinger 7eefed1410 wined3d: YUY2 and UYVY are block based. 2011-11-07 14:32:16 +01:00
Stefan Dösinger 7fd752047d d3d9/tests: Test partial block locks. 2011-11-07 14:27:24 +01:00
Andrew Talbot e0cd19d88d wined3d: Remove extraneous braces from switch statements. 2011-11-07 11:54:25 +01:00
Henri Verbeet a64271c07e wined3d: Make the surface parameter to blit_shader.set_shader() const. 2011-11-07 11:32:47 +01:00
Henri Verbeet 12268879a2 wined3d: Make the surface parameter to upload_palette() const. 2011-11-07 11:32:42 +01:00
Henri Verbeet 35515e4669 wined3d: Remove surface_draw_overlay from wined3d_surface_ops. 2011-11-07 11:32:34 +01:00
Henri Verbeet 48b6050ca3 wined3d: Remove surface_preload from wined3d_surface_ops. 2011-11-07 11:32:28 +01:00
Andrew Talbot a89584415b wined3d: Remove unneeded address-of operators from array names. 2011-11-04 14:44:56 +01:00
Matteo Bruni cc221b285b wined3d: Recognize Northern Islands cards with AMD binary drivers. 2011-11-04 10:45:54 +01:00
Matteo Bruni 7b0ba5153f wined3d: Test more thoroughly for post-pixelshader blending support, try on more texture formats. 2011-11-04 10:45:49 +01:00
Matteo Bruni 307579156f wined3d: Add filtering flag to more texture formats. 2011-11-04 10:45:42 +01:00
Henri Verbeet 55d8063e67 wined3d: Make the shader parameter to shader_arb_generate_pshader() const. 2011-11-04 10:44:54 +01:00
Henri Verbeet e3a105a626 wined3d: Make the shader parameter to shader_arb_generate_vshader() const. 2011-11-04 10:44:49 +01:00
Henri Verbeet 3a9001fbb6 wined3d: Make the shader parameter to init_output_registers() const. 2011-11-04 10:44:42 +01:00
Henri Verbeet e718306255 wined3d: Make some parameters to shader_generate_arb_declarations() const. 2011-11-04 10:44:37 +01:00
Henri Verbeet 3f11631e75 wined3d: Merge surface_getdc() and gdi_surface_getdc(). 2011-11-04 10:44:32 +01:00
Henri Verbeet 739dbab46e wined3d: Add fallbacks for d3d9 and d3d10 cards in select_card_amd_mesa(). 2011-11-04 10:44:19 +01:00
Henri Verbeet 3bfecd58d2 wined3d: Avoid a drawable -> texture transfer through sysmem in arbfp_blit_surface() with backbuffer ORM. 2011-11-04 10:44:14 +01:00
Claudio Fontana 485571539f wined3d: Rename nVidia GTX560 to GTX560TI, add GTX560 with correct device id. 2011-11-03 17:42:58 +01:00
Stefan Dösinger 9b0adb406d wined3d: Locking partial blocks is not allowed in DEFAULT pool resources. 2011-11-03 13:52:15 +01:00
Henri Verbeet 335a6ca78e wined3d: Use wined3d_surface_blt() in swapchain_gl_present(). 2011-11-03 13:00:50 +01:00
Henri Verbeet 0b3185665f wined3d: Use wined3d_surface_blt() in wined3d_swapchain_get_front_buffer_data(). 2011-11-03 13:00:45 +01:00
Henri Verbeet c30ea3767c wined3d: Use wined3d_surface_blt() in surface_upload_from_surface(). 2011-11-03 13:00:40 +01:00
Henri Verbeet 78bd84cc12 wined3d: Make the shader parameter to shader_arb_load_constantsF() const. 2011-11-02 12:27:59 +01:00
Henri Verbeet 117af3a2b1 wined3d: Make the buffer parameter to buffer_sanitize_flags() const. 2011-11-02 12:27:55 +01:00
Henri Verbeet 27132a30f5 wined3d: Construct the non-rhw projection matrix directly in transform_projection(). 2011-11-02 12:27:50 +01:00
Henri Verbeet 6e7f33a7f0 wined3d: Construct the rhw projection matrix directly in transform_projection(). 2011-11-02 12:27:40 +01:00
Henri Verbeet 1c91b08220 wined3d: Construct the projection matrix directly in set_blit_dimension().
This saves a needless matrix multiplication and is actually more obvious than
the glOrtho() call.
2011-11-02 12:27:34 +01:00
Henri Verbeet da64996159 wined3d: Make the buffer parameter to buffer_is_fully_dirty() const. 2011-10-31 23:53:04 +01:00
Henri Verbeet b9b2288796 wined3d: Make the buffer parameter to buffer_is_dirty() const. 2011-10-31 23:53:02 +01:00
Henri Verbeet b49e08aa8d wined3d: Get rid of the local_constant typedef. 2011-10-31 23:52:59 +01:00
Henri Verbeet fcf96b634a wined3d: Create the DIB section for DDSCAPS_OWNDC surfaces on initialization. 2011-10-31 23:52:51 +01:00
Henri Verbeet 7de4df9fd9 wined3d: Get rid of the wined3d_surface_bltfast() export. 2011-10-31 23:52:47 +01:00
Henri Verbeet f8e7b1e80c wined3d: Make the device parameter to wined3d_event_query_issue() const. 2011-10-31 16:46:20 +01:00
Henri Verbeet 76b5b8a67b wined3d: Make the device parameter to wined3d_event_query_finish() const. 2011-10-31 16:46:20 +01:00
Henri Verbeet eebad6a17a wined3d: Make the device parameter to wined3d_event_query_test() const. 2011-10-27 19:34:23 +02:00
Henri Verbeet bf5ab0a199 wined3d: Make the device parameter to surface_blt_to_drawable() const. 2011-10-27 19:34:19 +02:00
Henri Verbeet dbfe83baff wined3d: Rename nCfgs to cfg_count. 2011-10-27 19:34:15 +02:00
Henri Verbeet 61550ff1de wined3d: Use the correct pitch in surface_upload_data().
This fixes a regression introduced by commit
2da4f87a7e.
2011-10-27 19:34:00 +02:00
Henri Verbeet 22d2d26ffc wined3d: Make the device parameter to surface_blt_fbo() const. 2011-10-27 12:25:29 +02:00
Henri Verbeet 54dc38718b wined3d: Make the device parameter to wined3d_surface_depth_blt_fbo() const. 2011-10-27 12:25:24 +02:00
Henri Verbeet 6a981239db wined3d: Get rid of the unused palette9 wined3d_surface field. 2011-10-27 12:25:19 +02:00
Henri Verbeet 2f74d5052a wined3d: Recognize Sumo/Llano in select_card_amd_mesa(). 2011-10-27 12:25:00 +02:00
Matteo Bruni 095a9a6893 wined3d: Refuse to create a shader unsupported by the backend. 2011-10-26 12:41:35 +02:00
Matteo Bruni 5f2c6b3c82 wined3d: Enable SM4 support in the GLSL shader backend when possible. 2011-10-26 12:41:34 +02:00
Matteo Bruni 7254f5e661 wined3d: Return only the shader major version. 2011-10-26 12:41:34 +02:00
Henri Verbeet 7aac0159a9 wined3d: Move the ARB shader program constant handling to the backend where it belongs. 2011-10-26 12:41:33 +02:00
Henri Verbeet 89d0d3ffd8 wined3d: Get rid of the device parameter to context_setup_target(). 2011-10-26 12:41:33 +02:00
Henri Verbeet a42774f042 wined3d: Only check for sRGB attachability when needed in surface_load_texture(). 2011-10-26 12:41:33 +02:00
Henri Verbeet 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
Henri Verbeet bab2a40f87 wined3d: Make the device parameter to context_apply_clear_state() const. 2011-10-25 16:57:24 +02:00
Henri Verbeet 9b42c657e4 wined3d: Make the device parameter to context_apply_blit_state() const. 2011-10-25 16:57:24 +02:00