Commit Graph

3651 Commits

Author SHA1 Message Date
Henri Verbeet afc06ce748 wined3d: Get rid of a redundant memset() in device_stream_info_from_declaration(). 2009-08-27 11:45:37 +02:00
Henri Verbeet c514323442 wined3d: Properly check if an attribute is used in drawStridedInstanced(). 2009-08-27 11:45:37 +02:00
Jörg Höhle b9d955b86d wined3d: Delete meaningless UNIX GL driver version parsing. 2009-08-27 11:00:59 +02:00
Stefan Dösinger 52731a80c8 wined3d: Make it clear that glFlush and glFinish are WGL functions. 2009-08-26 14:35:41 +02:00
Stefan Dösinger 21f4e42a98 wined3d: Don't use WINED3DADAPTER_DEFAULT as refresh rate. 2009-08-26 14:35:33 +02:00
Stefan Dösinger 3f6909c1f2 wined3d: Initialize ps_arb_max_local_constants. 2009-08-26 14:35:27 +02:00
Henri Verbeet d4e167dfbc wined3d: Properly check if an attribute is used in remove_vbos(). 2009-08-26 12:10:45 +02:00
Henri Verbeet 59c017c8bd wined3d: Properly check if an attribute is used in state_normalize(). 2009-08-26 12:10:42 +02:00
Henri Verbeet 6ef17134d2 wined3d: Properly check if an attribute is used in transform_texture(). 2009-08-26 12:10:38 +02:00
Henri Verbeet f9c791f9ca d3d8: Use a wined3d cs for wined3d locking.
We will need this for d3d10, where both dxgi and d3d10core are making wined3d
calls. Right now d3d8/d3d9 also use this to protect their own data, but
eventually we should push this down into wined3d itself and use something a
bit more fine-grained. There's no good reason that doing e.g. a vertex buffer
upload in some thread should block all of wined3d.
2009-08-25 11:12:17 +02:00
Henri Verbeet 839658848c wined3d: Properly check if an attribute is used in find_conversion_shift(). 2009-08-25 11:09:45 +02:00
Henri Verbeet bda89180e1 wined3d: Properly check if an attribute is used in streamsrc(). 2009-08-25 11:09:40 +02:00
Henri Verbeet c9f270a5d9 wined3d: Properly check if an attribute is used in drawStridedSlow(). 2009-08-25 11:09:34 +02:00
Henri Verbeet 7823679e20 wined3d: Properly check if an attribute is used in state_colormat(). 2009-08-24 15:17:33 +02:00
Henri Verbeet c1c58f85ca wined3d: Properly check if an attribute is used in drawStridedSlowVs(). 2009-08-24 15:17:33 +02:00
Henri Verbeet 16b0c6a0fd wined3d: Properly check if an attribute is used in buffer_check_attribute(). 2009-08-24 15:17:33 +02:00
Henri Verbeet 850232810d wined3d: Properly check if an attribute is used in loadTexCoords(). 2009-08-24 15:17:33 +02:00
Henri Verbeet e48350a471 wined3d: Properly check if an attribute is used in loadVertexData(). 2009-08-24 15:17:32 +02:00
Henri Verbeet 0c4201d5fd wined3d: Properly check if an attribute is used in TRACE_STRIDED. 2009-08-21 11:12:01 +02:00
Henri Verbeet 458afd64bd wined3d: Properly check if an attribute is used in IWineD3DDeviceImpl_ProcessVertices(). 2009-08-21 11:10:26 +02:00
Henri Verbeet 4ec2b09d8f wined3d: Don't check for a "representative" in the MarkStateDirty() functions.
States without representative should never be called. Arguably they shouldn't
exist in the first place, but allowing them simplifies the state table.
2009-08-21 11:10:21 +02:00
Henri Verbeet b2e543b22f wined3d: Add a state handler for WINED3DRS_DEBUGMONITORTOKEN. 2009-08-21 11:10:15 +02:00
Henri Verbeet a36e30b541 wined3d: Mark the correct state dirty. 2009-08-21 11:10:07 +02:00
Stefan Dösinger 3cd91a451d wined3d: Use 50 chars for register names in texm3x3* functions. 2009-08-19 17:28:08 +02:00
Henri Verbeet c70f3816ab wined3d: Hide WINED3DFMT_R16G16B16A16_UNORM again.
This format is broken on some cards. Hide it until we figure out a reliable
way to deal with it.
2009-08-19 14:45:39 +02:00
Henri Verbeet 5a24a02ad5 wined3d: Pass the context's gl_info to state handlers. 2009-08-19 14:45:34 +02:00
Henri Verbeet dc8b1bdc0f wined3d: Rename some GLSL instruction handlers.
The pshader_glsl_* names are a leftover from when we had separate code for
vertex and fragment shaders.
2009-08-19 14:45:23 +02:00
Henri Verbeet ffb38da024 wined3d: Try to force a top-left filling convention. 2009-08-19 14:45:09 +02:00
Henri Verbeet 92b66ac82c wined3d: Make use_vs() safe to call from IWineD3DDeviceImpl_FindTexUnitMap(). 2009-08-19 14:45:02 +02:00
Rico Schüller d9784c1a2f wined3d: Fix some checkGLcalls. 2009-08-19 14:41:49 +02:00
Jörg Höhle 7763da811b wined3d: Check GL_SUPPORT prior to an ARB occlusion call. 2009-08-17 19:36:41 +02:00
Henri Verbeet d900491310 wined3d: Replace find_clip_texcoord() with a generic function for finding a free input register. 2009-08-17 13:57:50 +02:00
Henri Verbeet 8d0ad2cf36 wined3d: Remove a redundant IWineD3DDeviceImpl_MarkStateDirty() call.
We should now correctly track the relevant state per-context. The
IWineD3DDeviceImpl_SetViewport() call isn't quite correct for d3d8 and d3d9,
Stefan still has a patch for that.
2009-08-17 13:57:50 +02:00
Henri Verbeet b8078fc747 wined3d: Use WINED3D_UNMAPPED_STAGE in some more places. 2009-08-17 13:57:50 +02:00
Henri Verbeet 7a0670392c wined3d: Check the correct vertex sampler in device_unit_free_for_vs(). 2009-08-17 13:57:50 +02:00
Henri Verbeet 8cf7aa2bdd wined3d: Don't use a start index higher than MAX_COMBINED_SAMPLERS - 1 in device_map_vsamplers(). 2009-08-17 13:57:50 +02:00
Henri Verbeet ecd2dc7603 wined3d: Make RTL_READTEX the default rendertarget locking method.
For most cards this should make more sense than RTL_READDRAW, even if e.g.
surface_upload_data() has some room for improvement.
2009-08-14 13:59:09 +02:00
Henri Verbeet 779ad6b9f1 wined3d: Add a separate function for guessing the card. 2009-08-14 13:59:08 +02:00
Henri Verbeet 93218c6602 wined3d: Add a separate function for guessing the driver version.
Note that I don't necessarily think the ATI path for example will work
correctly. This patch is just for moving it out of IWineD3DImpl_FillGLCaps().
2009-08-14 13:59:08 +02:00
Henri Verbeet b94e89dae9 wined3d: Add a separate function for parsing the GL version. 2009-08-14 13:59:08 +02:00
Henri Verbeet a1402e0677 wined3d: Add a separate function for guessing the vendor. 2009-08-14 13:59:08 +02:00
Henri Verbeet c573d0a4c9 wined3d: Escape GL strings with debugstr_a() in IWineD3DImpl_FillGLCaps(). 2009-08-14 13:59:08 +02:00
Henri Verbeet 914a21740c wined3d: Recognize GL_VENDOR "Tungsten Graphics, Inc." as VENDOR_MESA. 2009-08-13 11:45:42 +02:00
Henri Verbeet e205973915 wined3d: Remove the redundant vs_nv_version and ps_nv_version fields from struct wined3d_gl_info. 2009-08-13 11:45:36 +02:00
Henri Verbeet fbc3cf89e2 wined3d: Remove some unused fields from struct wined3d_gl_info. 2009-08-13 11:45:24 +02:00
Henri Verbeet 42c2d06bc0 wined3d: Don't make wgl calls from under the GL lock. 2009-08-13 11:45:17 +02:00
Henri Verbeet f7918b978f wined3d: Make the "luminanceparams" shader_reg_maps member a bitmap. 2009-08-12 13:22:50 +02:00
Henri Verbeet 95bb4c0486 wined3d: Make the "bumpmat" shader_reg_maps member a bitmap. 2009-08-12 13:22:44 +02:00
Henri Verbeet 3d718d6414 wined3d: Make the "labels" shader_reg_maps member a bitmap. 2009-08-12 13:22:37 +02:00
Henri Verbeet 270f57e755 wined3d: Make the "address" shader_reg_maps member a bitmap. 2009-08-12 13:22:30 +02:00
Henri Verbeet 3ec639e38c wined3d: Fix swapchain draw buffer cleanup.
Destroying the first back buffer before the other ones might cause an already
freed surface to be used as target in FindContext().
2009-08-12 13:22:25 +02:00
Henri Verbeet 6fa9fa15da wined3d: Make the "temporary" shader_reg_maps member a bitmap. 2009-08-11 12:36:20 +02:00
Henri Verbeet 50853e295b wined3d: Make the "texcoord" shader_reg_maps member a bitmap. 2009-08-11 12:36:16 +02:00
Henri Verbeet a282380f08 wined3d: Fix the type of the shader_reg_maps bitfields. 2009-08-11 12:36:12 +02:00
Henri Verbeet b2ace3b1ab wined3d: Correctly check for luminance bumpmap parameters in shader_generate_glsl_declarations(). 2009-08-11 12:35:49 +02:00
Henri Verbeet 76fdf2c1a5 wined3d: Handle GetData() on event queries that aren't started yet.
This fixes a regression introduced by fb77678e9f.
2009-08-11 12:35:43 +02:00
Francois Gouget e74efb5487 Assorted spelling fixes. 2009-08-11 12:35:38 +02:00
Henri Verbeet cbd555bbc9 wined3d: Get rid of the unused vbo_mode setting. 2009-08-10 13:53:11 +02:00
Henri Verbeet 6794a57073 wined3d: Return ~0U for wined3d_log2i(0). 2009-08-10 13:53:05 +02:00
Henri Verbeet 3b06fc92f4 wined3d: Use EXT_provoking_vertex to match Direct3D's provoking vertex convention. 2009-08-10 13:52:50 +02:00
Henri Verbeet ac64bf6406 wined3d: Detect EXT_provoking_vertex. 2009-08-10 13:52:43 +02:00
Henri Verbeet 8d746c31ba wined3d: Properly handle negative loop step in shader_glsl_loop(). 2009-08-10 13:52:37 +02:00
Roderick Colenbrander 5a00c8053e wined3d: Get rid of two dead render target lock mode options. 2009-08-10 13:10:49 +02:00
Stefan Dösinger 4f9f8fef0b wined3d: Dirtify the correct state. 2009-08-07 14:57:09 +02:00
Stefan Dösinger 6f5a1d9a15 wined3d: Filter WINED3DSTENCILCAPS_TWOSIDED in d3d8. 2009-08-07 14:56:48 +02:00
Stefan Dösinger 296573caae d3d: Filter R8G8B8 in d3d8 and d3d9. 2009-08-07 14:56:40 +02:00
Stefan Dösinger 14eedc5be7 wined3d: Watch out about higher constants when clamping ps 1.x consts.
ps 1.x supports only 8 constants, so the shader load code dirtifies the
first 8 on a shader switch. However, the constant load code reloaded all dirty
consts with clamping. That potentially left constants > 8 clamped.
2009-08-07 14:56:33 +02:00
Henri Verbeet 35826e9761 wined3d: Fix a condition in record_lights(). 2009-08-07 12:11:35 +02:00
Henri Verbeet 41729ca919 wined3d: Check the return value of wglDeleteContext() in context_destroy_gl_resources(). 2009-08-07 12:11:27 +02:00
Henri Verbeet 7ed116da2e wined3d: Merge the context->current_rt check for rendertarget readback with the code above.
Also update the comments.
2009-08-07 12:11:17 +02:00
Henri Verbeet 0479fb13b5 wined3d: Explicitly pass the context to drawStridedSlow(). 2009-08-07 12:11:10 +02:00
Henri Verbeet 3bf0ad4528 wined3d: Explicitly pass the context to the shader_select() handler. 2009-08-07 12:11:06 +02:00
Stefan Dösinger c6d3e75482 wined3d: Not all cards support float16 filtering. 2009-08-06 17:26:31 +02:00
Henri Verbeet 4c1b3de936 wined3d: Call the shader_load_np2fixup_constants() handler directly from inside the shader backend. 2009-08-06 17:26:30 +02:00
Henri Verbeet 03686cb6bd wined3d: Explicitly pass the context to the shader_load_constants() handlers. 2009-08-06 17:26:30 +02:00
Henri Verbeet a7251f0f4e wined3d: Track render_offscreen in the context.
This makes sure the relevant states in FindContext() are actually marked dirty
when needed.
2009-08-06 17:26:30 +02:00
Henri Verbeet b04e992a65 wined3d: Set the WINED3DTEXF_NONE entry in the minification lookup table to GL_NEAREST.
Although WINED3DTEXF_NONE is not a valid minification filter, having it in the
tables simplifies the lookup. GL_NEAREST is more appropriate than GL_LINEAR
though.
2009-08-06 17:26:29 +02:00
Henri Verbeet 7165bd19c1 wined3d: WINED3DTEXF_NONE only makes sense as a mip filter. 2009-08-05 11:20:43 +02:00
Henri Verbeet 9e8f7898c9 wined3d: Get rid of the ANISOTROPIC entry from the filter lookup tables.
Anisotropy and texture filters are orthogonal in GL. In D3D
D3DTEXF_ANISOTROPIC just selects the best (linear) filter type and enables
anisotropy.
2009-08-05 11:20:36 +02:00
Henri Verbeet 62ac872b36 wined3d: Remove a redundant check from basetexture_get_autogen_filter_type().
This is already initialized to an appropriate value in basetexture_init().
Also fix the indentation while we're at it.
2009-08-05 11:20:24 +02:00
Henri Verbeet a86f31658b wined3d: Move texture filter lookup table initialization to basetexture_init(). 2009-08-05 11:20:19 +02:00
Henri Verbeet 351d6de818 wined3d: Add functions to lookup texture filters. 2009-08-05 11:20:09 +02:00
Henri Verbeet 0f161dc10f wined3d: Remove some unused code. 2009-08-05 11:19:59 +02:00
Stefan Dösinger 2858f67a2a wined3d: Enable WINED3DFMT_R16G16B16A16_UNORM. 2009-08-05 11:19:46 +02:00
Stefan Dösinger f3b39d9085 wined3d: Preload the correct texture location. 2009-08-05 11:19:35 +02:00
Stefan Dösinger f53451ddac wined3d: Only use WINE_normalized_texrect if ARB_texture_np2 is supported. 2009-08-05 11:19:26 +02:00
Stefan Dösinger 2e9362d0fb wined3d: ARB clipplane init needs the helper constant. 2009-08-05 11:19:14 +02:00
Henri Verbeet d4159adbc8 wined3d: Statically initialize the filter lookup tables.
Also add some comments.
2009-08-04 13:04:23 +02:00
Henri Verbeet b30a31e09a wined3d: Set a more appropriate value for the ANISOTROPIC/NONE min/mip filter. 2009-08-04 13:04:11 +02:00
Henri Verbeet 25fe98e02b wined3d: Don't disable mipmapping if we lack EXT_texture_filter_anisotropic.
These don't have a whole lot to do with each other.
2009-08-04 13:04:05 +02:00
Henri Verbeet efb78aca64 wined3d: Update the WINED3DSAMP_MAGFILTER state even if we didn't recognize the value.
It's a bit pointless to keep printing FIXMEs after the first time.
2009-08-04 13:03:44 +02:00
Henri Verbeet 10906e6b8e wined3d: Set the initial value of WINED3DTEXSTA_MAXANISOTROPY to 1. 2009-08-04 13:03:40 +02:00
Henri Verbeet 2f3e993e7e wined3d: Properly calculate GL_TEXTURE_MAX_ANISOTROPY_EXT. 2009-08-04 13:03:34 +02:00
Henri Verbeet b7812932bc wined3d: Don't respecify compressed textures in surface_upload_data().
Passing NULL to glCompressedTexImage2DARB() doesn't work particularly well
when both client storage and PBOs are enabled. Also, two years is long enough
to give driver developers a chance to fix the bug this was supposed to work
around.
2009-08-03 15:01:55 +02:00
Henri Verbeet da1e5573da wined3d: Rename WineD3DContext to struct wined3d_context. 2009-08-03 15:01:48 +02:00
Henri Verbeet 1d647283d5 wined3d: Don't use the GL texture flags to determine if a format is a depth stencil in CheckDepthStencilCapability().
The OpenGL implementation might not support ARB_depth_texture, but that
doesn't mean we can't use the format for the depth buffer.
2009-08-03 15:01:34 +02:00
Henri Verbeet 43bfb240ad wined3d: Use the context's current render target the get the swapchain drawable size.
"surface" might point to the frontbuffer while we're rendering to the
backbuffer, etc.
2009-08-03 15:01:25 +02:00
Henri Verbeet 0047c55e86 wined3d: Handle destruction of a context's current render target. 2009-08-03 15:01:18 +02:00
Henri Verbeet 9baf7864c5 wined3d: Return proper NULLs from CreateContext(). 2009-07-24 13:11:01 +02:00
Henri Verbeet be536ebe2f wined3d: Get rid of activeContext. 2009-07-24 13:10:57 +02:00