c52a55d724
wined3d: Fix some indentation.
2008-10-28 12:46:51 +01:00
092b51e82a
wined3d: Rename CreateAdditionalSwapChain to CreateSwapChain.
2008-10-28 12:46:46 +01:00
b33ddbde6a
wined3d: Support some more texture types for GLSL depth blts.
2008-10-28 12:33:36 +01:00
437b342424
wined3d: Pass explicit texcoords to depth blt.
2008-10-28 12:33:27 +01:00
57401fcab2
wined3d: Pass the texture type to the shader depth blt function.
2008-10-28 12:33:18 +01:00
4034a29f19
wined3d: Move depth_blt to surface.c.
2008-10-28 12:33:13 +01:00
69553c2514
wined3d: Fix the WineDirect3DCreate() export.
2008-10-27 12:37:27 +01:00
7142754820
wined3d: Remove the SDKVersion parameter to WineDirect3DCreate().
2008-10-24 14:24:59 +02:00
e79d89ff40
wined3d: Fix some typos.
2008-10-21 11:53:40 +02:00
bf187ed1e0
wined3d: Set the sampler only once in shader_glsl_select_depth_blt().
...
It (obviously) never changes.
2008-10-20 12:23:26 +02:00
2188aa87d6
wined3d: Add support for EXT_framebuffer_multisample.
2008-10-20 12:23:16 +02:00
728e61e78b
wined3d: Remove ENTER_GL/LEAVE_GL from VolumeTexture_PreLoad because it doesn't make any GL calls.
2008-10-20 11:39:01 +02:00
3e3141da34
wined3d: Protect gl calls in Volume_LoadTexture with ENTER_GL/LEAVE_GL.
2008-10-20 11:38:54 +02:00
47372928b8
wined3d: Fix recursive ENTER_GL in UpdateSurface.
2008-10-20 11:38:43 +02:00
e848aed2b8
wined3d: ActivateContext caused a lot of recursive ENTER_GL calls while it is especially dangerous in here as this function can indirectly trigger GDI calls.
2008-10-20 11:38:36 +02:00
b98a7b5082
wined3d: Fix recursive ENTER_GL in LoadLocation.
2008-10-20 11:38:19 +02:00
e5ed8edb89
wined3d: Fix a recursive ENTER_GL in read_from_framebuffer.
2008-10-20 11:38:11 +02:00
d4b4810ebe
wined3d: Prevent a recursive ENTER_GL before calling blitter->free_private.
2008-10-20 11:38:02 +02:00
3a1aeef7c7
wined3d: Add ENTER_GL/LEAVE_GL to gen_yuv_shader.
2008-10-20 11:37:54 +02:00
5163a360e0
wined3d: arbfp_blit_unset should call ENTER_GL/LEAVE_GL instead of the caller.
2008-10-20 11:37:46 +02:00
8a002b09c1
wined3d: arbfp_set_shader_blit should handle ENTER_GL/LEAVE_GL instead of the caller.
2008-10-20 11:37:38 +02:00
a2b2a4cf79
wined3d: Add one more FBO error status code.
2008-10-18 19:35:20 +02:00
6cfef95ce7
wined3d: Convert source files to utf-8.
2008-10-18 19:21:20 +02:00
723f3656e5
wined3d: Modifying GL_TEXTURE_MIN_FILTER modifies both the MINFILTER and MIPFILTER sampler states.
2008-10-16 12:35:51 +02:00
bd5abfb1e4
wined3d: Remove a redundant local variable in apply_draw_buffer().
2008-10-16 12:35:40 +02:00
231e2c60b5
wined3d: The container is always non-NULL if GetContainer() succeeds.
2008-10-16 12:35:34 +02:00
f5fbfe47d7
wined3d: Handle offscreen rendering a bit nicer in surface_blt_to_drawable().
2008-10-16 12:35:09 +02:00
e22bda24c6
wined3d: Simplify texture target handling in surface_blt_to_drawable().
2008-10-15 15:22:11 +02:00
c777f962a2
wined3d: We only need to enable texturing for a target if we're going to draw with it (without a shader).
...
Also, these enables cause problems if they're done while the context
is setup for blitting.
2008-10-15 15:22:06 +02:00
2889b42a3f
wined3d: Cleanup properly if creating the context array fails in CreateAdditionalSwapChain().
2008-10-15 15:21:41 +02:00
2bb7aa7252
wined3d: Don't crash in CreateAdditionalSwapChain() if the context array wasn't allocated yet.
2008-10-15 15:21:35 +02:00
0f38a60dd3
Assorted spelling fixes.
2008-10-10 14:14:05 +02:00
a98b19cef5
wined3d: Pass the correct RECT to LoadLocation() in LockRect().
2008-10-10 12:27:21 +02:00
cb472a3be7
wined3d: Declare diffuseColor and specularColor inside their respective blocks (LLVM/Clang).
2008-10-10 12:27:17 +02:00
3643d59d5b
wined3d: Make sure some variables are always initialized.
2008-10-09 12:14:26 +02:00
9aaccfe77f
wined3d: Correct some swizzles and write masks in arb_program_shader.
2008-10-09 12:14:21 +02:00
af6636c21c
wined3d: Don't do GL calls without a context.
2008-10-09 12:14:15 +02:00
3b2ac77e12
wined3d: Set the correct pow2Matrix for cube textures when NPOT textures are supported.
2008-10-09 12:14:08 +02:00
8985b7a755
wined3d: Get rid of some redundant assignments (LLVM/Clang).
2008-10-09 12:14:01 +02:00
937ceda47f
wined3d: Remove a redundant initialization of cfgs in CheckDepthStencilCapability (LLVM/Clang).
2008-10-09 12:13:53 +02:00
e9daf92ae6
wined3d: Assign the correct "levels" variable (LLVM/Clang).
2008-10-09 12:13:43 +02:00
ed96dd72e3
wined3d: Implement IWineD3DResourceImpl_GetPriority and IWineD3DResourceImpl_SetPriority for resource management.
2008-10-08 14:17:03 +02:00
31d6dbfd74
wined3d: Cleanup CreateAdditionalSwapChain error handling a bit (LLVM/Clang).
2008-10-08 12:16:54 +02:00
0420f17b1f
wined3d: Remove a redundant initialization of cfgs in WineD3D_ChoosePixelFormat.
2008-10-08 12:16:48 +02:00
d8c40f7641
wined3d: Print an error when drawStridedSlow() is called with 0 idxSize and non-NULL idxData (CID 509).
2008-10-08 12:16:35 +02:00
c5fbf98ed2
wined3d: Enable lights on the correct swapchain.
2008-10-06 13:06:44 +02:00
3a7fcec4d7
wined3d: Handle texture coordinates the same way we handle other vertex attributes.
2008-09-25 11:53:10 +02:00
2c1e4602a3
wined3d: If a stage isn't mapped to a texture unit, we can't set default coordinates either.
2008-09-25 11:53:03 +02:00
c6cd7a7717
wined3d: Properly handle the offset for compressed surfaces in IWineD3DDeviceImpl_UpdateSurface().
2008-09-25 11:52:56 +02:00
0ee57cf142
wined3d: Set the texture name at surface creation.
...
This prevents the target from changing during the first PreLoad() call
on a surface, which would be inconvenient when attaching a surface to
a FBO for example.
2008-09-25 11:52:50 +02:00
eaf2474003
wined3d: Split SetGlTextureDesc() up.
...
This creates a function for setting the texture name and one for
setting the texture target. The idea is that the texture target should
get set right after the surface is created, and won't change, while
generating a texture name can wait.
2008-09-25 11:52:42 +02:00
254349fb4d
wined3d: Remove the "Wine 1.0 safety path".
2008-09-24 12:53:29 +02:00
5ba40c3d58
wined3d: Make some more GLSL functions private to the backend.
2008-09-24 12:53:23 +02:00
a0940051eb
wined3d: Make some more ARB program functions private to the backend.
2008-09-24 12:53:16 +02:00
daef052daa
wined3d: atifs_shader_backend doesn't exist anymore.
2008-09-24 12:53:10 +02:00
2e76954097
wined3d: Move part of the shader instruction table to the backend.
2008-09-24 12:53:05 +02:00
e2bc8dfe3b
wined3d: Use shader_glsl_log() in some more places.
2008-09-23 12:25:32 +02:00
ca28930113
wined3d: Merge pshader_hw_map2gl() and vshader_hw_map2gl().
...
This isn't the prettiest way to merge those functions, but it's a start.
2008-09-23 12:25:27 +02:00
9d192c6251
wined3d: Skip copying the depth stencil if it's discarded.
...
This gives a small performance improvement for applications that are
smart enough to set the D3DPRESENTFLAG_DISCARD_DEPTHSTENCIL flag, or
to create depth stencils with Discard set to TRUE.
2008-09-23 12:25:18 +02:00
d95ae08ad4
wined3d: Get rid of the wantsDepthStencilBuffer in IWineD3DSwapChainImpl.
2008-09-23 12:25:04 +02:00
0362ee3d16
wined3d: UpdateSurface should take into account the offset from the source rectangle.
2008-09-22 13:19:57 +02:00
c13b3f6179
wined3d: Re-add a comment which got lost.
2008-09-22 12:20:42 +02:00
f84680e66c
wined3d: Don't try to draw with unsupported attribute data types.
2008-09-22 12:20:34 +02:00
3862347bce
wined3d: Fix a memory leak.
2008-09-22 12:20:28 +02:00
76de76e508
wined3d: Destroy FBO entries in the context.
2008-09-22 12:20:24 +02:00
459673da1a
wined3d: Make sure update_minfilter and update_magfilter are initialized.
2008-09-22 12:20:18 +02:00
2e6717ab79
wined3d: Initialize standalone surface parameters.
2008-09-22 12:20:13 +02:00
43f2ec33bf
wined3d: Fix Geforce9 detection.
2008-09-19 12:09:57 +02:00
45820046e8
wined3d: Create a FBO for each combination of render targets and depth stencil.
...
The main reason for this change is crappy performance for reconfiguring FBOs.
2008-09-19 11:30:00 +02:00
3a8ab00fe1
wined3d: Get rid of context_set_depth_stencil_fbo().
...
Integrate clearing the depth stencil attachment in context_attach_depth_stencil_fbo().
2008-09-19 11:29:48 +02:00
8f2ed870f1
wined3d: Get rid of context_set_render_target_fbo().
...
Integrate clearing the attachment in context_attach_surface_fbo().
2008-09-19 11:29:39 +02:00
734b31e00b
wined3d: Handle drawbuffers in context_apply_fbo_state() instead of context_set_render_target_fbo().
2008-09-19 11:29:27 +02:00
9533a5cbbf
wined3d: Split off a function for applying an attachment's filter states.
2008-09-19 11:29:18 +02:00
a269236649
wined3d: Move FBO handling functions to context.c.
2008-09-19 11:29:13 +02:00
9e3b9f8b41
wined3d: Add a checkGLcall() at the end of loadTexCoords().
...
To prevent GL errors in loadTexCoords from showing up in different state handlers
2008-09-17 20:50:04 +02:00
9e955d3a28
wined3d: Make the debug channels more consistent.
2008-09-17 20:49:57 +02:00
728932f2eb
wined3d: Don't needlessly bind the texture in PreLoad().
2008-09-17 20:49:47 +02:00
17330c03de
wined3d: Don't assume the texture is bound in IWineD3DVolumeImpl_LoadTexture().
2008-09-17 20:49:42 +02:00
99981f2604
wined3d: Remove some assumptions that PreLoad() will always bind the texture.
2008-09-17 20:49:38 +02:00
53a7951230
wined3d: Clarify a comment.
2008-09-17 20:49:33 +02:00
147ec1a1a4
wined3d: Use the internal format for renderbuffer storage.
...
Note that using GL_DEPTH_COMPONENT instead of eg. GL_DEPTH_COMPONENT24
will work, but will create a renderbuffer with the format of the
onscreen depth buffer.
2008-09-16 22:34:03 +02:00
ad658c22b8
wined3d: IWineD3DCubeTextureImpl implements IID_IWineD3DCubeTexture, not IID_IWineD3DTexture.
2008-09-16 22:33:54 +02:00
047e42da08
wined3d: Improve a TRACE.
2008-09-16 22:33:46 +02:00
ee49230cd2
Make some ARB program structs and functions private to the backend.
2008-09-16 22:33:42 +02:00
c2178eb64f
wined3d: Make some GLSL structs and functions private to the backend.
2008-09-16 22:33:35 +02:00
e3e113383e
wined3d: Degrade an ERR to a TRACE.
2008-09-15 11:29:20 +02:00
36cf25b598
wined3d: Fix long int warnings.
2008-09-12 13:33:00 +02:00
6e1194f06e
wined3d: Fix SHOW_FRAME_MAKEUP debug dump code.
2008-09-12 13:30:02 +02:00
ae7572217d
wined3d: Some ARB code fixes.
2008-09-11 11:43:34 +02:00
035729ab97
wined3d: Don't disable arbfp if the pipeline replacement is in.
2008-09-11 11:43:30 +02:00
d51ea01159
wined3d: Reset the auto depth stencil.
2008-09-10 12:05:31 +02:00
4987ffff1f
wined3d: Correct a comment.
2008-09-10 12:03:48 +02:00
27b8f719ca
wined3d: Fix the half pixel offset.
...
Turns out the original fix was correct for fixed function, but for the
wrong reason. The shader path was already correct. This fixes a
regresssion introduced by 932e95c111
2008-09-10 12:03:42 +02:00
932e95c111
wined3d: Translate one pixel down after flipping for offscreen rendering.
2008-09-08 14:09:29 +02:00
6a14bcc824
wined3d: Add missing HeapFree.
2008-09-08 12:31:43 +02:00
e1797b530d
wined3d: Remove spaces before '\n' in Wine traces.
2008-09-05 13:39:08 +02:00
fe64fe5ef8
wined3d: Fix uploading higher transform matrices.
2008-09-05 11:23:30 +02:00
271f56c9f1
wined3d: Close a pshader on-off switching loophole.
2008-09-05 11:23:19 +02:00
c36e033856
wined3d: Fix the pixelformat selection logic.
2008-09-05 11:23:09 +02:00
421b6558c1
wined3d: Pack the ffp_desc structure better.
2008-09-05 11:22:55 +02:00
81effcf30d
wined3d: Set the viewport to the texture size in depth_blt().
2008-09-05 10:50:55 +02:00
da1030f36c
wined3d: Compressed surface sizes are multiples of 4.
...
Since those surfaces are stored in blocks, the 4 pixel step doesn't only apply to surfaces < 4, but
also to surfaces bigger than that, with a non-multiple-of-4 size.
2008-09-04 12:44:00 +02:00
78312704d9
wined3d: Remove obsolete code & ModifyLocation TODO.
...
This fbo logic appears to have already been implemented in ModifyLocation.
2008-09-04 12:29:57 +02:00
1bcd6e4508
wined3d: Get rid of gl buffer variable in BltOverride.
...
Uses This == dstSwapchain->frontBuffer instead as suggested by Henri Verbeet.
2008-09-04 12:29:50 +02:00
7c38816819
wined3d: Remove glDrawBuffer calls in BltOverride.
...
Handled in ActivateContext, must be remains of pre-context management code.
2008-09-04 12:29:42 +02:00
5c7f2906ee
wined3d: Make the condition to enter p8 conversion shader path more strict.
...
This prevents shader path from being entered for an offscreen surface
when there is p8 render target and fixes failures in ddraw visual test
(with opengl rendering and RTL_READDRAW mode) and visual glitches in
Red Alert.
2008-09-04 12:29:35 +02:00
525e30e6b7
wined3d/d3d9: Set the initial scissorrect to the dimesions of the backbuffer from the first swapchain of the device.
2008-09-04 12:26:59 +02:00
615f75faec
wined3d: IWineD3DSurface_PreLoad() doesn't do an implicit glBindTexture() anymore.
...
This was exposed by moving texture id generation from Preload() to BindTexture().
2008-09-04 11:15:33 +02:00
632102cd14
wined3d: Correct a TRACE and remove an incorrect comment.
2008-09-04 11:15:24 +02:00
4b354e8e62
wined3d: Fix a variable name inside a VTRACE.
2008-09-04 11:15:17 +02:00
5fd7a59e70
wined3d: Use the correct representative for texture transform states.
2008-09-04 11:15:09 +02:00
d37c6fc0a9
wined3d: Depth stencil tracking depends on the value of This->render_offscreen.
2008-09-04 11:15:01 +02:00
4b6887b8e3
wined3d: Be more careful when deleting FBOs.
...
Clear all attachments before deleting FBOs. It should be valid to
delete FBOs that still have attachments, but for some reason the
nvidia drivers don't like it. The resulting memory corruption can be
pretty nasty, and this workaround seems clean enough.
2008-09-04 11:14:53 +02:00
e13d0efb01
wined3d: Remove glFlush in RealizePalette.
...
glFlush was added to surface_blt_to_drawable some time ago, which is a
more general fix and makes this one superfluous.
2008-09-03 13:14:52 +02:00
379f400990
wined3d: Add glFlush when clearing the front buffer in ClearSurface.
2008-09-03 13:14:52 +02:00
ab74030ec5
wined3d: Optimize the projected bump map handling.
2008-09-02 14:56:57 +02:00
d5f05c59c7
ddraw: Beware of the surface type when checking for format support.
2008-09-02 14:56:26 +02:00
d60ece20b5
wined3d: Implement secondary color in the arbfp ffp pipeline.
2008-09-02 14:56:15 +02:00
8b1727ae62
wined3d: Report incorrect filtering settings in ValidateDevice.
2008-09-02 14:56:06 +02:00
422eebd2c3
wined3d: BLENDTEXTUREALPHAPM reads the texture.
2008-09-02 14:55:57 +02:00
3b48660f43
wined3d: Implement YV12 support for emulated overlays.
...
This is the prefered format of many codecs, and for some codecs this
is the only supported output format. As usual I try to handle all the
conversion in the GPU and keep the CPU involvement minimal to gain the
full performance of PBO transfers.
2008-09-02 14:55:50 +02:00
9c63e186c6
wined3d: Add a '\n' to Wine traces.
2008-09-02 13:59:11 +02:00
4823b2c7bf
Assorted spelling fixes.
2008-09-02 13:58:21 +02:00
b4f43e372e
wined3d: Remove useless hash_table_t typedef.
2008-08-29 12:26:55 +02:00
af8d268a39
wined3d: Handle projected textures properly in arbfp and atifs.
...
GL_ARB_fragment_program and GL_ATI_fragment_shader can disable
projected textures properly, and they can also handle
D3DTTFF_PROJECTED | D3DTTFF_COUNT3 properly.
2008-08-28 11:24:49 +02:00
ec4955630e
wined3d: Silence some format spam.
2008-08-28 11:24:49 +02:00
acc893c5cf
wined3d: Handle projected+bump mapped textures in atifs.
2008-08-28 11:24:49 +02:00
4635315655
wined3d: Replace a #if 0 with if(0).
2008-08-28 11:24:49 +02:00
a580325a47
wined3d: Remove some more junk code.
2008-08-28 11:24:49 +02:00
750973cec5
wined3d: Remove BaseTexture::UnBindTexture.
2008-08-28 11:24:49 +02:00
005e5e868e
wined3d: Replace an #if 0 with if(0).
2008-08-28 11:24:49 +02:00
462ddaa254
wined3d: Make the texture stage mapping nvrc independent.
2008-08-27 13:21:24 +02:00
0e2713a1e1
wined3d: Remove unneeded code.
...
The fixed function backend disables the extension. Also messing
with the final combiner shouldn't be needed if nvrc is disabled.
2008-08-27 13:21:24 +02:00
a674ae71ae
wined3d: Remove dead code.
2008-08-27 13:21:24 +02:00
43fe6b0bcf
wined3d: Remove some junk.
2008-08-27 13:21:24 +02:00
dda59e361c
wined3d: Update the arbfp shader on a texturetransformflags change.
2008-08-27 13:21:24 +02:00
8f20b882bb
wined3d: Handle texture transforms in the TEXTURETRANSFORMFLAGS state.
...
This is a nop by itself, but it makes it easier for fragment pipelines
to read WINED3DTSS_TEXTURETRANSFORMFLAGS.
2008-08-27 13:21:24 +02:00
8dcc6b66dc
wined3d: Clean up the texbeml parameter forward.
...
There's no point in separating scale and luminance since they're
uploaded at the same time. We still want to separate the stages
though.
2008-08-27 13:21:24 +02:00
b294e43206
wined3d: D3DTOP_DOTPRODUCT3 colorop overrides the alphaop.
...
Note that the fix is only implemented in the arbfp and atifs fragment
pipeline. Unfortunately nvrc doesn't support dot3 as alpha operation.
2008-08-27 13:21:24 +02:00
97b57931d0
wined3d: Advertise a few line caps.
2008-08-27 13:21:24 +02:00
6bbcc5050b
wined3d: Disable D3DFMT_R3G3B2.
2008-08-27 13:21:23 +02:00
9b94c0abb9
wined3d: Make the alphaop == colorop matching a bit smarter.
2008-08-26 12:07:41 +02:00
4767be8cde
wined3d: The final luminance factor is clamped.
2008-08-26 12:07:41 +02:00
f8ead75566
wined3d: Declare the texture factor when D3DTOP_BLENDFACTORALPHA is used.
2008-08-26 12:07:41 +02:00
9a6bc683e1
wined3d: Use the correct texture limit.
...
We have to use the texture limit of the fragment pipeline in use here,
not the fixed function GL texture limit.
2008-08-26 12:07:41 +02:00
8fc2cfe432
wined3d: Fix projected bump mapping.
2008-08-26 12:07:41 +02:00
6c6a6a2e61
wined3d: Implement D3DTA_ALPHAREPLICATE in arbfp and atifs.
...
Also adds a simple test for this. In the fixed function and nvrc/nvts
code this already works properly.
2008-08-26 12:07:41 +02:00
6c12b81552
wined3d: Implement D3DTOP_BUMPENVMAPLUMINANCE.
2008-08-26 12:07:41 +02:00
e8b9f167d6
wined3d: Fix the texcoord size mask.
...
There is room for 8 texture coordinates, not just 4.
2008-08-26 12:07:41 +02:00
e110f2c680
wined3d: Don't retry less strict formats if a match was found.
2008-08-25 12:26:26 +02:00
61a900fdfc
wined3d: Fix the drawStridedSlow callback function calling convention.
...
Since some of those function pointers are direct GL functions the function
prototype needs the WINE_GLAPI calling convention. This makes prevents
drawStridedSlow from crashing with USE_WIN32_OPENGL.
2008-08-25 12:26:17 +02:00
ec633bf789
wined3d: Disable D3DFMT_A2W10V10U10.
2008-08-25 12:25:33 +02:00
1043a04673
wined3d: Disable D3DFMT_A4L4.
2008-08-25 12:25:23 +02:00
f39e122477
wined3d: Add fixed function sRGB write correction.
2008-08-25 12:25:13 +02:00
6c87a66355
wined3d: Get a GL context before creating a PBO.
2008-08-25 12:24:43 +02:00
ba58adaaf6
wined3d: Remove a few texture initializations.
...
This is done by LoadLocation now.
2008-08-25 12:24:33 +02:00
f0f32912a6
wined3d: Make sure the pixel shader is compiled.
...
If we're heading out of the pixelshader handler early, and a pixel
shader is in use, the pixel shader may not be compiled. The vertex
shader handler then checks if the pixel shader is dirty, and calls the
shader backend to apply the shader if it isn't. Thus, in the case of
GLSL, the shader code could attempt to link an uncompiled shader into
the program. This isn't much of a problem because when the fog is
applied, the pixel shader is compiled and the program re-linked.
2008-08-25 12:24:24 +02:00
5b77a2f90b
wined3d: Override the default filter of conditional np2 textures.
2008-08-25 12:24:06 +02:00
9f82368908
wined3d: Use the proper internal type for some formats.
2008-08-25 12:23:00 +02:00
6fbbcd19e7
wined3d: Move a TRACE up a few lines.
2008-08-25 11:39:16 +02:00
e3507a725f
wined3d: glDeleteFramebuffersEXT() needs a context.
2008-08-25 11:39:10 +02:00
eca8577d53
wined3d: Use 8 bits-per-component for the PBO test internal format.
...
GL_RGBA doesn't gaurantee an internal storage depth, which can cause the test
to fail if it's stored with less than 8 bits of precision. Some nVidia
drivers would actually store with 4 bits of precision.
2008-08-25 11:29:38 +02:00
bb67a925d6
ddraw: Only ddraw checks wether one can give a null pointer to SetMaterial.
2008-08-22 11:32:09 +02:00
fd0e60180a
wined3d: Fix window rewrite regression.
2008-08-22 10:39:23 +02:00
b917bdaa52
wined3d: Remove useless hash_table_entry_t typedef.
...
It doesn't add much.
2008-08-22 10:39:08 +02:00
05931f4a5a
wined3d: Track FBOs per-context.
...
Although sharing FBOs across contexts is allowed by EXT_framebuffer_object
(issue 76), it causes issues with nVidia drivers. Considering the GL 3 spec
explicitly disallows sharing of FBOs accross contexts (Appendix D), this
patch is probably the right thing to do.
2008-08-22 10:38:59 +02:00
2f99bcdde2
wined3d: Move depth stencil location handling code up a couple of lines.
...
This is just for clarity, so that render targets and the depth stencil are
handled in the same place.
2008-08-22 10:38:30 +02:00
67631163ff
wined3d: Fix copy paste error in IWineGDISurfaceImpl_RealizePalette.
...
It has to update the whole surface, so NULL must be passed to
x11_copy_to_screen. Fixes a regression in Red Alert.
2008-08-21 13:35:35 +02:00
03ae71dad9
wined3d: Set D3DPTEXTURECAPS_TRANSPARENCY.
...
It indicates support of colorkey transparency on textures, so set it because
wined3d supports it. Fixes transparency problems in Forsaken.
2008-08-21 13:35:30 +02:00
1da8a032af
wined3d: Disable TEXTURE_RECTANGLE in SetupForBlit.
2008-08-21 13:35:23 +02:00
c38b2fe09e
wined3d: Filter out more spam.
2008-08-21 13:34:23 +02:00
c425bbccab
wined3d: Set the texture wrap default with the NP2 emulation properly.
2008-08-21 13:33:42 +02:00
46109da87d
wined3d: Don't skip applying texdims with shaders.
...
There's no need to do that with the nvts and opengl ffp fixed function
fragment pipeline, it's perfectly well defined in GL which one takes
effect. This removes a few more troubles when switching between
shaders and arbfp.
2008-08-21 13:33:30 +02:00
ec94c2ea99
wined3d: Don't enable texture dimensions with shaders.
...
ARB and GLSL don't need that. If a shader backend like atifs or nvts
need it in the future, the shader backend should deal with that rather
than the ffp pipeline.
2008-08-21 13:33:20 +02:00
77204574d1
wined3d: Prefer aux buffer matches over alpha matches.
...
Half Life 2 uses D3DFMT_X8R8G8B8 for the back buffer, but macos
supports aux buffers only on D3DFMT_A8R8G8B8. I think having aux
buffers is more important right now than having a precise alpha
match.
2008-08-21 13:33:09 +02:00
bbf313e76a
d3d9: Test for fixed function value clamping.
2008-08-21 13:27:58 +02:00
bab367e1a0
wined3d: Update the overlay when the destination was drawn to.
2008-08-21 13:27:47 +02:00
040c33de5a
wined3d: Don't allocate This->draw_buffers in the error path for Init3D().
2008-08-21 11:36:29 +02:00
c33e03cca3
wined3d: Don't free backends if they're not created yet.
...
This would crash if CreateAdditionalSwapChain() failed.
2008-08-21 11:36:18 +02:00
8fe6bf0bad
wined3d: Fix the unused arg marker.
2008-08-20 12:34:44 +02:00
5d75939b09
wined3d: Keep track of the last used device.
2008-08-20 12:33:25 +02:00
1f4cf3513d
wined3d: Implement YUV emulation with GL_ARB_fragment_program.
2008-08-20 12:26:14 +02:00
bfe7067973
wined3d: Ask the ffp/shader/blit implementation about format support.
...
If a format is not supported natively by opengl, a shader may be able
to convert it. Up to now, CheckDeviceFormat had magic knowldge which
GL extensions lead to which supported format. This patch adds
functions that allow CheckDeviceFormat to ask the actual
implementation for its capabilities.
2008-08-20 12:26:02 +02:00
438b6bd4c3
wined3d: Test formats for surface support.
2008-08-20 12:25:46 +02:00
fc6b977486
wined3d: Start a framework for color conversion shaders in blits.
2008-08-20 12:25:26 +02:00
6a24b28b75
wined3d: Support YUV formats with GL_APPLE_ycbcr_422.
2008-08-20 12:25:00 +02:00
4421e3ebe5
wined3d: Fix BltOverride regression.
2008-08-20 11:45:41 +02:00
f71fdecdc7
wined3d: Move creating a texture id from PreLoad to BindTexture.
...
This is consistent with BindTexture in basetexture/texture/etc. and has the
added benefit that it makes LoadLocation work properly.
2008-08-20 10:26:19 +02:00
3d49e8cd5e
wined3d: Add a swapchain method to set the dest override.
...
DDraw can draw to the front buffer only, thus there's never a Present
call which could pass this window. Due to that a drawing-independent
method is needed.
2008-08-19 12:25:20 +02:00
25c07dc86c
wined3d: Remove the ddraw_window device member.
2008-08-19 12:25:05 +02:00
376944ebe4
wined3d: Remove the device-global fullscreen flag.
2008-08-19 12:24:57 +02:00
34b37fe241
d3d: Remove IWineD3DDevice::SetHwnd.
2008-08-19 12:22:05 +02:00
7f2b8f9bba
wined3d: Support redirecting the primary context.
2008-08-19 12:21:49 +02:00
e178ddd9e1
wined3d: Use a swapchain for GDI surfaces.
...
This is a long-needed cleanup aimed at removing the ddraw_primary,
ddraw_window, ddraw_width and ddraw_height members from
IWineD3DDeviceImpl, which just do not belong there. Destination
window and screen handling is supposed to be done by swapchains.
2008-08-19 12:21:32 +02:00
e5de2fc82c
wined3d: Move some swapchain code into a base class.
2008-08-19 12:20:47 +02:00
dff3a42233
wined3d: Track overlay surfaces in the overlayed surface.
2008-08-05 14:09:37 +02:00
b0c4673779
wined3d: Update the surface locations in Present.
2008-08-05 14:09:37 +02:00
851dd7339e
wined3d: Implement overlay flipping.
2008-08-05 14:09:36 +02:00
fad3f9ba98
wined3d: Basic overlay emulation with opengl.
2008-08-05 14:09:36 +02:00
e795d842ec
wined3d: Implement overlay position tracking.
2008-08-05 14:09:36 +02:00
a7d5b1e9a5
wined3d: Move the pshader fog update to the vertex pipeline.
2008-08-05 14:09:36 +02:00
eb0264e2b3
wined3d: Remove a glFlush.
2008-08-05 14:09:36 +02:00
44d419ad8e
wined3d: Call glFlush outside the GL lock.
2008-08-05 14:09:36 +02:00
2d6d879562
wined3d: Handle CTXUSAGE_BLIT with offscreen targets and FBO ORM.
...
This is mostly for correctness, in practice we should always be able
to avoid using CTXUSAGE_BLIT for offscreen targets when FBO ORM is
used.
2008-08-05 14:09:34 +02:00
b685b84e66
wined3d: Apply FBO state in ActivateContext().
...
Fixes some GL errors due to calling glDrawBuffer(GL_BACK) when an FBO
is still active.
2008-08-05 14:09:34 +02:00
9a9414dfe2
wined3d: Mark STATE_SCISSORRECT dirty in color_fill_fbo().
...
As pointed out by Alexander Dorofeyev.
2008-08-05 14:09:34 +02:00
2583975ec7
wined3d: Remove arb_tex_npot for NV FX series in fixup_extensions.
2008-08-04 14:05:01 +02:00
d28a310f92
wined3d: Use CTXUSAGE_RESOURCELOAD for ActivateContext() in color_fill_fbo().
...
CTXUSAGE_CLEAR will apply the FBO state in a later patch.
2008-08-04 13:52:16 +02:00
f037eb8696
wined3d: Move setting the draw buffer to a separate function.
2008-08-04 13:52:09 +02:00
e9827cc916
wined3d: Always load glFinish and glFlush from opengl32.dll.
2008-08-04 13:12:10 +02:00
399825cd8e
wined3d: Report the pitch alignment to ddraw.
2008-08-04 13:10:37 +02:00
8ee4159e4f
wined3d: Only set D3D caps when GL was loaded successfully.
2008-08-04 13:10:20 +02:00
a47e7badb9
ddraw: Set ddraw caps in wined3d.
...
Currently the ddraw capabilities were almost static, except of D3D
support. When overlay support is added, the caps depend on certain
settings in WineD3D or capabilities available from OpenGL and Xv. So
set those caps in wined3d as well.
2008-08-04 13:10:11 +02:00
474e7ed98c
wined3d: Beware of the frontbuffer coordinate system difference.
2008-08-04 13:09:43 +02:00
016efe7d94
wined3d: Clamp results in the arbfp pipeline replacement.
...
Fixed function processing can only deal with values between 0 and 1
generally. Clamp the results of instructions that could produce bigger
or smaller values.
2008-08-04 13:07:53 +02:00
228f2cf3c2
wined3d: Initialize the texture op function properly.
2008-08-04 13:07:26 +02:00
a793888a28
Assorted spelling fixes.
2008-08-04 13:04:48 +02:00
eb4ee4f4ad
wined3d: Rework surface Blt a bit to only lock the part of the destination surface being drawn to.
2008-07-31 13:41:14 +02:00
c08e4927f9
wined3d: Check validity of rects before locking surface in Blt.
2008-07-31 13:41:07 +02:00
daa59e00be
wined3d: Call LoadLocation() on higher render targets as well, simplify some code in drawPrimitive.
...
It's probably rare for higher render targets to get locked or updated
from sysmem, but this should still be more correct. It also makes the
code simpler.
2008-07-31 13:04:08 +02:00
14b24058d6
wined3d: GL_ARB_fragment_program ffp implementation.
2008-07-31 13:02:04 +02:00
bc4435e406
wined3d: Use a hashmap to store the ffp shaders.
2008-07-31 13:01:50 +02:00
d4d133f032
wined3d: Use C bitfields to compact the ffp description.
2008-07-31 13:01:36 +02:00
76e02581a9
wined3d: Add ActivateContext in color_fill_fbo.
...
Also removes dirtifying of SCISSORTESTENABLE state that is made
redundant by ActivateContext(...,CTXUSAGE_CLEAR).
2008-07-30 13:54:40 +02:00
c7da79ded3
wined3d: FBO texture == drawable handling is already handled in LoadLocation().
2008-07-30 12:44:18 +02:00
9b47996b41
wined3d: Container dirtification is already handled in ModifyLocation().
2008-07-30 12:44:12 +02:00
294f1b4aad
wined3d: Add fog and tex types to the ffp fragment description.
2008-07-28 11:36:15 +02:00
40cfec2582
wined3d: Do not enable GL_TEXTURE_SHADER_NV unconditionally.
2008-07-28 11:36:04 +02:00
5a6b4e9f47
wined3d: Make the MAC ARBvp implementation happy about ARL.
2008-07-24 11:56:52 +02:00
726d9d47af
wined3d: ATI2N support using GL_EXT_texture_compression_rgtc.
2008-07-24 11:56:42 +02:00
dc25a86cc5
wined3d: Support ATI's D3DFMT_ATI2N format.
...
This is an ATI specific format designed for compressed normal maps,
and quite a few games check for its existence. While it is an
ATI-specific "extension" in d3d9, it is a core part of
D3D10(DXGI_FORMAT_BC5), and supported on Geforce 8 cards.
2008-07-24 11:56:24 +02:00
370b8299ab
wined3d: Honor the texcoordindex when setting the texture matrix.
2008-07-24 11:56:02 +02:00
b554cdbb5a
d3d: D3DDECLTYPE_UNUSED is not valid in vertex declarations.
2008-07-24 11:55:42 +02:00
eea2c95727
wined3d: Move set_tex_op(_nvrc) to their specific files.
2008-07-22 13:01:45 +02:00
212ff6ff57
wined3d: Remove some #ifdefs.
2008-07-22 13:01:22 +02:00
bfd1ac26e2
wined3d: Set WINED3DDEVCAPS2_VERTEXELEMENTSCANSHARESTREAMOFFSET.
2008-07-22 13:01:15 +02:00
448fee2879
wined3d: Whitespace fix.
2008-07-22 13:01:07 +02:00
d66c05ce1d
wined3d: Fix a copy and paste bug.
...
This happened to work because most cards have the same amount of
pshader and vshader constants, but for some reason this doesn't hold
true on this macbook pro here, which lead to a crash due to heap
corruption
2008-07-22 13:00:58 +02:00
1219e3d4a7
wined3d: Use less strict pixel format matching if the match fails.
...
Some drivers(the open source ones most notably) cannot satisfy all
possible D3D formats. This doesn't mean we should fall back to the
emergency fallback instantly. Instead, try to loosen the requirements
step by step.
2008-07-22 13:00:47 +02:00
cafec08516
wined3d: Use the nofilter mipmap lookup for np2 textures.
...
This is cleaner than the if statements in the code. Also np2 textures
should in theory support linear filtering, but fglrx doesn't seem to
like it. This needs further investigation. So far we've never used
linear filtering on np2 textures, so there should not be a
regression. Furthermore I think shader support is more important than
filtering, since NP2 textures are mostly used for 1:1 copying to the
screen.
2008-07-18 11:41:21 +02:00
c088edeae7
wined3d: Use GL_ARB_texture_non_power_of_two emulation.
...
ATI cards prior to the radeon HD series did not have unconditional non
power of two support. So far we've used texture_rectangle for that, or
created a bigger power of two texture with padding. This had the
disadvantage that we had to correct the coordinates, which causes
extreme problems with shaders(doesn't work, pretty much).
Both the MacOS and the fglrx driver have support for
GL_ARB_texture_non_power_of_two, and run it on the hardware as long as
we stay within the texture_rectangle limitations. This allows us to
have conditional non power of two textures with normalized
coordinates. This patch adds an internal extension, and the code
creates a regular GL_TEXTURE_2D texture with NP2 size, but refuses
mipmapping, filtering and texture_rectangle incompatible
operations. This makes np2 textures work with shaders on fglrx and
macos.
2008-07-18 11:41:09 +02:00
a0cc79f0bf
wined3d: Correct the D3DTOP_LERP parameter order.
2008-07-18 11:40:40 +02:00
5b846adffd
wined3d: Fix the MULTIPLYADD parameter orders in atifs.
2008-07-18 11:40:33 +02:00
55ab14a4ed
wined3d: Move an VBO support check to the state template.
2008-07-18 11:40:19 +02:00
dc203d36c9
wined3d: Remove more dead code.
...
The opengl extension mentioned in that code was never finished, and as
far as I know there is no way to make use of tangent data in the d3d
fixed function pipeline as well.
2008-07-18 11:40:12 +02:00
e5f42f91b6
wined3d: Remove GL_EXT_vertex_weighting stubs.
2008-07-18 11:40:00 +02:00
ebc77732c1
wined3d: Move the vertexblend support check to the template.
2008-07-18 11:39:44 +02:00
f981afd7d3
wined3d: Check for ATI_ENVMAP_BUMPMAP in the template.
...
Note that GL_ATI_envmap_bumpmap is not the same as
GL_ATI_fragment_shader. envmap_bumpmap is used together with the
regular opengl ffp pipeline and is not used (other than for
pixelformats) if GL_ATI_fragment_shader is used.
2008-07-18 11:39:38 +02:00
8bb11dad76
wined3d: Only register the np2 texture fixup if needed.
2008-07-18 11:39:18 +02:00
d247953687
wined3d: Test for multisampling in the template.
2008-07-17 11:45:00 +02:00
9c1b6581c6
wined3d: Move the point sprite support test into the template.
2008-07-17 11:44:54 +02:00
94e455343d
wined3d: Split the psizemax state handler.
2008-07-17 11:44:48 +02:00
7740dda1da
wined3d: Split the psizemin handler.
2008-07-17 11:44:42 +02:00
710b9a76b3
wined3d: Move the range fog support test to the template.
2008-07-17 11:44:34 +02:00
df4dcc34aa
wined3d: Move a few extension checks into the state template.
2008-07-17 11:44:28 +02:00
3ee9de462e
wined3d: Move an extension check into the state template.
2008-07-17 11:44:21 +02:00
ed49f9a848
wined3d: Coalesce the nvrc and nvts+nvrc state template.
2008-07-17 11:44:15 +02:00
35f33ef409
wined3d: Add extension information to the states.
...
This patch adds a new field to the state templates. If this extension
field is != 0, then the line is only applied to the final state table
if the extension is supported. Once a line is applied to the final
table, all further templates for this state from the same pipeline
part are ignored. This allows removing some extension checks from the
state handlers, which cleans them up and saves a few CPU cycles when
applying the states.
2008-07-17 11:44:08 +02:00
c72c70d609
wined3d: Store the texture in a local variable in sampler_texmatrix().
...
Slightly improves readability.
2008-07-17 11:36:42 +02:00
9528b1c63e
wined3d: Enable filtering for D3DFMT_A4R4G4B4.
...
This patch enables texture filtering for textures using the A4R4G4B4
format, I can see no reason why it shouldn't be filtered (especially
considering X4R4G4B4 has it).
2008-07-16 19:56:24 +02:00
7f741f0414
wined3d: Use rev_tex_unit_map instead of assuming there's a 1:1 mapping between samplers and texture units.
2008-07-16 17:54:41 +02:00
be405c71c0
wined3d: Improve some shader traces.
...
Make it clear the traced values are hexadecimal.
2008-07-16 17:54:23 +02:00
0064976d54
wined3d: Remove unneeded address-of operators from array names.
2008-07-14 11:50:22 +02:00
e27734779c
wined3d: Remove some dead code.
2008-07-14 11:46:33 +02:00
197f472ea8
wined3d: Separate texture_activate_dimensions.
...
This creates an nvts version of this function, and removes the nvts
code from the original one. The nvts version is used by the nvts
pipeline implementation, the original one by the nvrc-only, atifs and
ffp one.
2008-07-14 11:46:25 +02:00
88ae2fe14a
wined3d: Give nv* fixed function stuff its own state template.
2008-07-14 11:46:11 +02:00
38934fe70d
wined3d: Move shader constant affecting states to the misc pipeline.
...
As long as we have the shader constants in misc, it is best to keep
all the code that affects shader constants, like bumpenvmat setting,
in there as well.
2008-07-14 11:44:48 +02:00
84d39a95e5
wined3d: WINED3DTSS_TEXCOORDINDEX belongs to the vertex pipeline.
2008-07-14 11:44:36 +02:00
86b033bbb9
wined3d: Give the nvts/nvrc code its own pipeline implementation.
...
This code creates the structures and the pipeline selection, as well
as the caps filling. It does not yet move the actual code around,
since this will be a bigger task.
2008-07-14 11:44:26 +02:00
7c216b8ab5
wined3d: Simplify the fragment pipeline selection.
...
This should do the same as the existing code, but it is more obvious.
2008-07-14 11:43:51 +02:00
51e64b3fe9
wined3d: Move fixed function texture dimension updates to the fragment pipeline.
...
This is a further separation of the sampler state, and a preparation
to move the nv texture shader stuff to its own pipeline implementation.
2008-07-14 11:43:41 +02:00
d3c29b7063
wined3d: NP2 coordinate adjustment is a vertex operation.
...
When a sampler is changed and unconditional NP2 textures are not
supported, the texture matrix may need adjustment. The sampler state
function checks for that, and calls the texture transform setting
function in that case. However, samplers are a misc state, and the
texture transform flags a vertex state. Thus split up the code and
move the matrix changes to the vertex side.
2008-07-14 11:43:30 +02:00
e7733eacb7
wined3d: Remove the atifs shader backend.
...
Since atifs is only doing the fragment pipeline replacement right now
there is no need for the shader backend structure any longer. The ffp
private data is stored in new fragment pipeline private data(which
could potentially be set to equal the shader private data if needed).
2008-07-14 11:43:09 +02:00
e4078fb0ba
wined3d: Set ffp caps in the ffp backend, not the shader backend.
2008-07-11 14:32:53 +02:00
c48195e417
wined3d: Move shader_fragment_enable to the fragment pipeline implementation.
...
It isn't related to the shader backend any longer. The nvts_enable in
the ffp code isn't quite right as well, it should be moved away once
there is a dedicated nvts fragment pipeline replacement
2008-07-11 14:32:37 +02:00
f330815da5
wined3d: Samplers -> misc states.
2008-07-11 14:31:53 +02:00
f8824996e9
Wined3d: Move the last states.
2008-07-11 14:31:44 +02:00
9b15e25411
wined3d: One more psize state.
2008-07-11 14:31:36 +02:00
721301fb3f
wined3d: Point size vertex states.
2008-07-11 14:31:26 +02:00
6129e92e99
wined3d: Destroy the shader backend after the stateblock.
...
Destroying the stateblock potentially references the shader backend.
If the stateblock has active shaders when it is released, the shader's
destructor will tell the shader backend to destroy the corresponding
resources. This was exposed by my patch that moved the glsl program
lookup table into the backend's private data.
2008-07-11 13:58:13 +02:00
b37cc08721
wined3d: Don't call shader_select() in depth_blt().
...
Calling shader_select() from inside depth_blt() isn't necessarily
safe. shader_select() assumes CompileShader() has been called for the
current shaders, but that depends on STATE_VSHADER / STATE_PIXELSHADER
being applied. That isn't always true when depth_blt() gets called,
with the result that sometimes GLSL programs could be created with no
shader objects attached.
2008-07-10 20:33:29 +02:00
dbaec0a101
Assorted spelling fixes.
2008-07-10 13:40:15 +02:00
031ee3e695
wined3d: A few more junk misc states.
2008-07-10 12:30:56 +02:00
c31dfc7d0d
wined3d: A few more vertex states.
2008-07-10 12:30:56 +02:00
9086ed2d2e
wined3d: WINED3DRS_SRGBWRITEENABLE->fragment.
2008-07-10 12:30:56 +02:00
0b67a84b44
wined3d: Wrapping states -> misc.
2008-07-10 12:30:56 +02:00
dd95fce9fb
wined3d: texturefactor-> fragment states.
2008-07-10 12:30:56 +02:00
6fa9f0e363
wined3d: Stencil states -> misc table.
2008-07-10 12:30:56 +02:00
de1b0a5c04
wined3d: Move a few more odd states to the misc state table.
2008-07-10 12:30:56 +02:00
e988c8bd60
wined3d: WINED3DRS_ZBIAS -> misc states.
2008-07-10 12:30:56 +02:00
1df66c3893
wined3d: Move the bordercolor to the fragment states.
2008-07-10 12:30:56 +02:00
340272bc26
wined3d: Move more fog stuff to the vertex states.
2008-07-10 12:30:55 +02:00
8320d214d4
wined3d: Move float_32_to_16() to surface_base.c which is the only place where it's used, and because it needs port.h for isinf().
2008-07-10 12:18:43 +02:00
54ae3ebfd4
wined3d: Destroy depth_blt resources in the backend's destructor.
...
No need to expose this in the interface.
2008-07-10 12:17:06 +02:00
ecc7b5fb18
wined3d: Move fog to the vertex states.
2008-07-09 10:49:17 +02:00
cd9690d9d0
wined3d: Move a few more states to the misc states.
2008-07-09 10:48:59 +02:00
a4c85d788a
wined3d: WINED3DRS_LASTPIXEL -> misc states.
2008-07-09 10:48:50 +02:00
58ef02fa69
wined3d: Alpha states -> misc pipeline states.
2008-07-09 10:48:43 +02:00
5f3b11e9d6
wined3d: Move wrapu to the misc states.
2008-07-09 10:48:33 +02:00
dd90d62356
wined3d: Move a few more states to the misc pipeline.
2008-07-09 10:48:26 +02:00
b4445e8b98
wined3d: Textureperspective->misc states.
2008-07-09 10:48:17 +02:00
cad055ae16
wined3d: Move WINED3DRS_ANTIALIAS to the misc states.
2008-07-09 10:48:08 +02:00
f68ac7465f
wined3d: Move pixelshader application to the fragment pipeline.
2008-07-09 10:47:59 +02:00
b24c409cea
wined3d: Initialize the state table before filling it.
2008-07-09 10:47:49 +02:00
a85a5ffb1b
wined3d: Store the glsl program lookup table in the backend's private data.
2008-07-09 10:42:57 +02:00
a2628d0423
wined3d: Move Fixed function pipeline states to the new fragment structure.
2008-07-08 21:08:54 +02:00
3a2743f25d
wined3d: Remove the state table from the shader backend.
2008-07-08 21:08:54 +02:00
2d7cdc3ec2
wined3d: Remove the DLL load init function.
2008-07-08 21:08:54 +02:00
94b723505f
wined3d: Communicate the atifs functions via the fragment pipeline impl.
...
Move those things out of the state table.
2008-07-08 21:08:54 +02:00
c15dfb87e9
wined3d: Create fragment processing state templates and select one.
...
For now the atifs selection sticks to the old rules, thus it is bound to
the available and selected shader capabilities. We may want to change that
in the future.
2008-07-08 21:08:54 +02:00
bdfaab5a94
wined3d: Move texture transform flag stuff to the vertex pipeline states.
2008-07-08 21:08:54 +02:00
68948f0c71
wined3d: Move transforms to the vertex code.
...
Some fragment pipeline implementations may want to register their own
texture transform handlers.
2008-07-08 21:08:54 +02:00
1f5bce3454
wined3d: indexbuffer -> misc.
2008-07-08 21:08:54 +02:00
b4bee02556
wined3d: Move the viewport to the vertex and misc pipeline states.
2008-07-08 21:08:54 +02:00
4b831a5d3e
wined3d: Move shader constants to the misc states.
2008-07-08 21:08:54 +02:00
a637fda7bf
wined3d: Store the current GLSL program in the backend's private data.
2008-07-08 10:47:30 +02:00
95099404d5
wined3d: Move lights to the vertex pipeline states.
2008-07-08 10:47:20 +02:00
298c953b25
wined3d: Move the scissor rect to the misc states.
2008-07-08 10:47:12 +02:00
3668f7508f
wined3d: Move clipplanes to vertex states.
2008-07-08 10:47:05 +02:00
eb9d3d2a8f
wined3d: Move the frontfacing state to the misc state table.
2008-07-08 10:46:57 +02:00
956bfca1e2
wined3d: Move material application to the vertex pipeline.
2008-07-08 10:46:50 +02:00
141f31f05d
wined3d: Move stream source and vshader to misc and vertex pipeline tables.
2008-07-08 10:46:42 +02:00
6675374dda
wined3d: Make the stream source application a regular state function.
2008-07-08 10:46:32 +02:00
68dec9d161
wined3d: Implement the state merger and start to use it.
2008-07-08 10:46:20 +02:00
98faed8ff5
wined3d: Start the state splitup.
...
The idea of this patchset is to split the monolithic state set into 3
parts, vertex processing, fragment processing and other states(depth,
stencil, scissor, ...). The states will be provided in templates which
can be (mostly) independently combined, and are merged into a single
state table at device creation time. This way we retain the advantages
of the single state table and having the advantage of separated
pipeline implementations which can be combined without any manually
written glue code.
2008-07-08 10:45:56 +02:00
155d3ac4cc
wined3d: Remove an unneeded atifs hack.
...
The atifs fragment processing implementation doesn't borrow a pixel shader
implementation from anywhere. It was a hack during development, but never needed.
2008-07-08 10:45:05 +02:00
9be8f36c2e
wined3d: Correct an off-by-one error in constant dirtification.
...
Constant numbers start at 0, and the loading loop has a for(i; i <
dirtyconsts; i++). This means that the highest dirty constant isn't
loaded correctly. Rather than replacing the < with <=, which would
make it impossible to have no dirty constant, add 1 to the dirty
constant counter.
2008-07-07 12:33:41 +02:00
6ced8a3f55
wined3d: Remove unneeded address-of operators from function names.
2008-07-07 12:32:39 +02:00
422d71f630
wined3d: Fix a deadlock that may occur during initialization.
2008-07-03 11:50:52 +02:00
4f77c29bcf
wined3d: Track depth stencil location per-surface.
...
This gets rid of depth_copy_state in the device, and instead tracks
the most up to date location per-surface. This makes things a lot
easier to follow, and allows us to make a copy when switching depth
stencils in SetDepthStencilSurface().
2008-07-03 11:50:52 +02:00
e7d0ef72ba
wined3d: Use dst_fbo to do the depth blit.
...
This makes the depth copy independent of the currently attached render
targets. This is important for the next patch because it might do a
depth copy when the render targets aren't in a valid configuration
(SetDepthStencilSurface()).
2008-07-03 11:50:51 +02:00
22421b8476
wined3d: Make sure the FBO doesn't have any depth attachments in color_fill_fbo() and stretch_rect_fbo().
...
Currently this is already true, but the next patch will break that assumption.
2008-07-03 11:50:51 +02:00
8d930f6009
wined3d: Restore the gamma when destroying the swapchain.
2008-07-02 12:27:05 +02:00
2d4d18b59d
wined3d: Delay render target activation.
...
The ActivateContext in SetRenderTarget was an old regression prevention,
but now it is time to remove it.
2008-07-02 12:25:12 +02:00
1c7f39ed1e
wined3d: Use CTXUSAGE_RESOURCELOAD for fb->texture reads.
...
There is no need for _BLIT usage. RESOURCELOAD should be faster.
2008-07-02 12:24:54 +02:00
74c5684f90
wined3d: Update the blit ortho on size changes.
...
SetupForBlit sets up the GL viewport and projection matrix for
screen-cordinate access to the framebuffer. These settings were not
updated if the other gl states were already set up for blitting. Guild
Wars reads back an offscreen rendered texture from the framebuffer,
which currently sets up CTXUSAGE_BLIT, then changes the render target,
and draws to the texture, which has to be reloaded from system memory
before it can be rendered to(since GW loaded some data into it). If the
two render targets had different size this failed.
2008-07-02 12:24:35 +02:00
c4eae160d7
wined3d: RENDERTARGET | AUTOGENMIPMAP are compatible.
...
The test used D3DPOOL_MANAGED which is mutually exclusive with
RENDERTARGET usage, thus the call failed.
2008-07-02 12:24:12 +02:00
d5a8875b93
wined3d: Extract an attach_depth_stencil_fbo() function.
...
The idea is to make setting depth attachments a bit more consistent
with set_render_target_fbo()/attach_surface_fbo(). I've also got an
upcoming patch in my tree that needs this.
2008-07-02 11:37:31 +02:00
a1a14fb2c3
wined3d: Get rid of a redundant local variable.
2008-07-02 11:37:25 +02:00
d76de4eede
wined3d: Specify the GLSL language version our shaders are written to.
...
This prevents some driver warnings when using language features from
1.20, like "first class arrays".
2008-07-01 12:26:05 +02:00
d5cbb8375e
wined3d: Use ModifyLocation() to force a reload on color key change.
...
Just unsetting SFLAG_INTEXTURE doesn't work for FBOs because the
drawable and texture are the same there (and ModifyLocation() is the
correct way to do this anyway). Fixes another ddraw test failure with
FBO ORM.
2008-07-01 12:25:54 +02:00
8d6dc9daa7
wined3d: Move setting a palette up a couple of lines in BltOverride().
...
This prevents a few failures in the ddraw tests when using FBOs due to
using P8 surfaces without a palette set.
2008-06-30 12:47:34 +02:00
469e791f00
wined3d: Invert "upsidedown" in fb_copy_to_texture_direct() and fb_copy_to_texture_hwstretch() rather than BltOverride().
...
This inversion is specific to the blit implementation being used,
stretch_rect_fbo() doesn't need it.
2008-06-30 12:47:25 +02:00
90b7efe2c4
wined3d: Delete depth_blt_texture on IWineD3DDeviceImpl_Uninit3D().
2008-06-27 11:10:11 +02:00
ad59eaf998
wined3d: Report WINED3DPMISCCAPS_MRTPOSTPIXELSHADERBLENDING.
...
As far as I can tell we support post ps blending in combination with
MRTs fine. Tabula Rasa needs this cap in order to enable some of the
higher graphics settings.
2008-06-27 11:10:04 +02:00
756b401f8d
wined3d: Add a trailing '\n' to a couple of shader_addline() calls.
2008-06-26 21:08:35 +02:00
c433562a68
wined3d: Explicitly enable depth buffer writing in depth_blt().
...
This prevents conflicts with WINED3DRS_ZWRITEENABLE.
2008-06-25 10:43:08 +02:00
ebcb5f23a1
wined3d: Half float formats need ARB_TEXTURE_FLOAT as well.
...
Currently we only check if ARB_HALF_FLOAT_PIXEL is supported. This is
not enough, we need ARB_TEXTURE_FLOAT as well. This fixes some errors
when running the d3d9 visual test with Mesa swrast.
2008-06-23 12:55:08 +02:00
02a2ba9d2f
wined3d: Report post pixelshader blending on WINED3DFMT_A16B16G16R16F.
2008-06-23 12:55:02 +02:00
ee3bbccf6e
wined3d: Update the Nvidia driver version to 173.41 and also put it in the right format e.g. 7.15.11.7341 instead of 7.15.10.17341.
2008-06-23 12:53:45 +02:00
Henri Verbeet