8d7a01963e
wined3d: Use D3DCUBEMAP_FACES consistently in the WINED3D namespace.
2006-10-31 12:10:52 +01:00
aa164647e6
wined3d: Use D3DDEGREE consistently in the WINED3D namespace.
2006-10-31 12:10:42 +01:00
4c723a7662
wined3d: Add D3DSTREAMSOURCE codes to the WINED3D namespace.
2006-10-31 12:10:31 +01:00
f71edf223f
wined3d: Add D3DCOLORWRITEENABLE codes to the WINED3D namespace.
2006-10-31 12:10:12 +01:00
b1df1d8320
wined3d: Add D3DCLEAR codes to the WINED3D namespace.
2006-10-31 12:09:46 +01:00
de108f65e1
wined3d: Add D3DTSS_TCI codes to the WINED3D namespace.
2006-10-31 12:09:15 +01:00
875a1eb02d
wined3d: Add D3DFVF codes to the WINED3D namespace.
2006-10-31 12:09:06 +01:00
eb7b1f4bce
wined3d: Fix introduced regression in shader_glsl_mnxn and vshader_hw_mnxn.
2006-10-30 20:37:34 +01:00
908853f63d
wined3d: Add D3DMATERIALCOLORSOURCE to the WINED3D namespace.
2006-10-30 12:06:17 +01:00
206d248e48
wined3d: Add D3DCMPFUNC to the WINED3D namespace.
2006-10-30 12:06:10 +01:00
2b6deb8637
wined3d: Add D3DSTENCILOP to the WINED3D namespace.
2006-10-30 12:06:03 +01:00
f5cc612842
wined3d: Add D3DFILLMODE to the WINED3D namespace.
2006-10-30 12:05:55 +01:00
02fb9f6f41
wined3d: Add D3DCULL to the WINED3D namespace.
2006-10-30 12:05:48 +01:00
16767d21e1
wined3d: Add D3DSHADEMODE to the WINED3D namespace.
2006-10-30 12:05:36 +01:00
042fa7be8b
wined3d: Add D3DBLENDOP to the WINED3D namespace.
2006-10-30 12:05:31 +01:00
4eced8ea24
wined3d: Add D3DFOGMODE to the WINED3D namespace.
2006-10-30 12:05:24 +01:00
69550f2c47
wined3d: Make GetTexture and GetSamplerState read from the correct stateblock.
2006-10-30 11:53:26 +01:00
a648d4e3a3
wined3d: Set correct default for DMAPOFFSET sampler state.
2006-10-30 11:53:13 +01:00
61f9061484
wined3d: Fix GetTexture() for uninitialized textures.
2006-10-30 11:53:08 +01:00
9497e89d89
wined3d: Respect ARB_VERTEX_BUFFER_OBJECT in loadVertexData.
2006-10-30 11:17:01 +01:00
b4f42c94a7
wined3d: Simplify some uses of the WineD3D_Context object.
2006-10-27 15:03:07 +02:00
6afcf77889
wined3d: The WineD3D_GLContext structure doesn't need to be exported.
2006-10-27 14:42:17 +02:00
00ddebfafa
wined3d: Fix a memory leak (spotted by Eric Pouech).
2006-10-27 14:41:25 +02:00
da6c01bea0
wined3d: Implement D3DSIO_MOVA in ARB backend.
2006-10-27 14:12:58 +02:00
5f79e80827
wined3d: Add D3DZBUFFERTYPE to the WINED3D namespace.
2006-10-24 20:06:45 +02:00
10cbffb335
wined3d: Add D3DBLEND to the WINED3D namespace.
2006-10-24 20:06:38 +02:00
4f611bc0e0
wined3d: Add D3DTA masks to the WINED3D namespace.
...
Also fix usage of D3DTSS/D3DTA in ddraw.
2006-10-24 20:06:30 +02:00
93b3106be2
wined3d: Add D3DVS_RASTOUT_OFFSETS to the WINED3D namespace.
2006-10-24 20:06:21 +02:00
997e670e12
wined3d: Add D3DTADDRESS to the WINED3D namespace.
2006-10-24 20:06:15 +02:00
74cd90a18a
wined3d: D3DLOCK: Use consistently in the WINED3D namespace.
2006-10-24 20:06:06 +02:00
4ada8a5e26
wined3d: Fix the FrontBuffer content capturing.
2006-10-20 10:19:39 +02:00
3447c21f22
wined3d: Correct the software cursor position if the app is running in windowed mode.
2006-10-20 10:19:28 +02:00
1635da4b46
wined3d: BltOverride: Make sure that the content of the source rect is
...
copied to the correct position in the destination rect.
2006-10-20 10:18:59 +02:00
ef998ea6cb
Assorted spelling fixes.
2006-10-16 11:33:38 +02:00
8e1e62616a
wined3d: Remove '\0's in traces.
2006-10-16 11:30:53 +02:00
1e6a38967c
d3d8: Implement CopyRects with BltFast.
2006-10-16 11:26:00 +02:00
58162f87fd
Assorted spelling fixes.
2006-10-13 11:55:04 +02:00
ce2e980d1b
wined3d: Add shader version/end masks to the WINED3D namespace.
2006-10-13 11:15:45 +02:00
9846602412
wined3d: Add D3DTEXTURETRANSFORMTYPE to the WINED3D namespace.
2006-10-13 11:15:31 +02:00
4745e602d2
wined3d: Add D3DCLIPPLANE constants to the WINED3D namespace.
2006-10-13 11:15:18 +02:00
b7edf5b008
wined3d: Add D3DSHADER_ADDRMODE masks to the WINED3D namespace.
2006-10-13 11:15:00 +02:00
29aa316d67
wined3d: Add D3DSI and other opcode masks to the WINED3D namespace.
2006-10-13 11:14:47 +02:00
6f0bb0f6fc
wined3d: Add D3DVERTEXBLENDFLAGS to the WINED3D namespace.
2006-10-13 11:14:33 +02:00
c912032aa5
wined3d: Add D3DTEXTUREOP to the WINED3D namespace.
2006-10-13 11:13:02 +02:00
532fe7a1cf
wined3d: Merge D3DDP_MAXTEXCOORD constants into one constant in WINED3D namespace.
2006-10-12 12:38:02 +02:00
2bac4a02da
wined3d: Merge D3DPRIMITIVETYPE types into one type in WINED3D namespace.
2006-10-12 12:37:52 +02:00
1cd7bcf4c8
wined3d: Merge D3DCOLOR types into one type in WINED3D namespace.
2006-10-12 12:37:40 +02:00
9628a1b2e2
wined3d: Merge D3DRECT types into one type in WINED3D namespace.
2006-10-12 12:37:08 +02:00
ac37163124
wined3d: Merge D3DMATRIX types into one type in WINED3D namespace.
2006-10-12 12:35:00 +02:00
ec782c2b97
wined3d: D3DTRANSFORMSTATETYPE: Consistently use in the WINED3D namespace.
2006-10-12 12:33:39 +02:00
b1a4bd87a9
wined3d: D3DRENDERSTATETYPE: Consistently use in the WINED3D namespace.
2006-10-12 12:33:24 +02:00
5f2987ae32
wined3d: Merge VIEWPORT types into one type in WINED3D namespace.
2006-10-11 12:21:54 +02:00
90f5be2bef
wined3d: Merge MATERIAL types into one type in WINED3D namespace.
2006-10-11 12:21:14 +02:00
70bbf734b1
wined3d: Merge LIGHT types into one type in WINED3D namespace.
2006-10-11 12:21:06 +02:00
fea4495a61
wined3d: TEXTUREFILTERTYPE: Consistently use in WINED3D namespace.
2006-10-11 12:20:34 +02:00
a07a8f793b
wined3d: D3DDECLTYPE: Consistently use in WINED3D namespace.
2006-10-11 12:20:21 +02:00
f0d5b35c97
wined3d: D3DQUERYTYPE: Consistently use in WINED3D namespace.
2006-10-11 12:19:15 +02:00
837027fcb7
wined3d: D3DTEXTURESTAGESTATETYPE: Consistently use in WINED3D namespace.
2006-10-11 12:18:53 +02:00
19c5534c35
wined3d: D3DDEVTYPE: Consistently use in WINED3D namespace.
2006-10-11 12:17:52 +02:00
fb0c932f21
wined3d: D3DFORMAT: Consistently use WINED3D namespace.
2006-10-11 12:17:21 +02:00
94a86c1224
wined3d: Improve shader_dump_decl_usage() TRACEs.
2006-10-10 19:58:39 +02:00
f2d77d103f
wined3d: Corrected names in checkGLcall text.
2006-10-10 19:58:29 +02:00
82379f22a7
wined3d: Move D3DSP dest modifier related items into the WINED3D namespace.
2006-10-10 13:38:45 +02:00
76b571cb48
wined3d: Move D3DSP source modifier-related items into the WINED3D namespace.
2006-10-10 13:38:36 +02:00
17c9d9588a
wined3d: Move D3DSP_REG structures into the WINED3D namespace.
2006-10-10 13:37:49 +02:00
e8137632c7
wined3d: Move D3DSP DCL-related structures into WINED3D namespace.
2006-10-10 13:37:35 +02:00
7259b9d8b6
wined3d: Move D3DSPR structure into the WINED3D namespace.
2006-10-10 13:37:12 +02:00
062541c026
wined3d: Move D3DSIO structure into WINED3D namespace.
2006-10-10 13:37:03 +02:00
8192555dff
wined3d: Fix DEBUG_SINGLE_MODE.
2006-10-10 11:57:58 +02:00
e020eceddf
wined3d: Make the shader mode selections per device.
2006-10-09 20:27:55 +02:00
4b248447c0
wined3d: Fix '\n' typo.
2006-10-06 17:29:22 +02:00
331679bcc9
wined3d: Disable GL_REGISTER_COMBINERS_NV (if supported) in IWineD3DSurfaceImpl_BltOverride.
2006-10-06 15:24:08 +02:00
6bcc5ae9f7
wined3d: Pitch alignment for the pow2Size.
2006-10-06 12:53:25 +02:00
d45c16ba98
wined3d: Define the surface alignment in the header.
2006-10-06 12:53:24 +02:00
90f097f835
wined3d: Honor the pitch in a few more places.
2006-10-06 12:53:24 +02:00
49deec6139
wined3d: No color keying on surfaces with an alpha channel.
2006-10-06 12:53:24 +02:00
3529560cd7
wined3d: Add WINED3DUSAGE_OVERLAY.
2006-10-06 12:53:24 +02:00
2bcacf22d3
wined3d: Add IWineD3DSurface::UpdateOverlay.
2006-10-06 12:53:24 +02:00
080e4f56cf
wined3d: Add UpdatOverlayZOrder.
2006-10-06 12:53:24 +02:00
f6647486cf
wined3d: Add IWineD3DSurface::GetOverlayPosition.
2006-10-06 12:53:24 +02:00
0f3995d21a
wined3d: Add IWineD3DSurface::SetOverlayPosition.
2006-10-06 12:53:24 +02:00
67436f9dbd
wined3d: Correctly name a variable.
2006-10-06 12:32:29 +02:00
82babbee0b
Add missing '\n's to Wine traces.
2006-10-05 17:46:48 +02:00
80afd74933
wined3d: Report the correct number of available 4-component float vectors for GLSL.
2006-10-02 21:38:22 +02:00
35bd8d32b1
wined3d: Explicitly enable the GL_ARB_draw_buffers extension in GLSL shaders.
2006-10-02 21:38:18 +02:00
3dcd3681f3
wined3d: Win64 printf fixes.
2006-10-02 14:38:04 +02:00
01d9eac0be
wined3d: Remove unused field in shader opcode_arg.
2006-10-02 12:32:30 +02:00
222c167969
Assorted spelling fixes.
2006-09-29 16:28:30 +02:00
85ce5117c5
Add a WINE_NO_LONG_INT define to many makefiles to ease the transition of DWORD/LONG/ULONG from long to int.
2006-09-29 16:08:30 +02:00
ab8264a86d
wined3d: Tell gl about the surface alignment.
2006-09-28 11:56:29 +02:00
10d13b2186
wined3d: Fix typo in ResourceReleased.
2006-09-27 20:20:54 +02:00
42a9262acf
wined3d: Read GL info and load constants into the same device.
2006-09-27 19:53:43 +02:00
d0032a1a2a
wined3d: Move device pointer into the BaseShader class.
2006-09-27 19:44:09 +02:00
5abdd7a19f
wined3d: Comparing BOOLs against FALSE is redundant.
2006-09-27 09:49:07 +02:00
1d839e42e9
wined3d: Add a comment to clarify the point of max_sampler_stages.
2006-09-27 09:48:30 +02:00
193f6bbd92
wined3d: Add support for native NPOT textures.
2006-09-27 09:48:11 +02:00
fdefaed46d
wined3d: Enable pixel shaders by default.
2006-09-27 09:47:00 +02:00
ba8a6a3c0c
wined3d: Fix the default values for wined3d_settings.
2006-09-27 09:46:37 +02:00
5bc0e91ddf
wined3d: Don't overwrite the position y offset in ARB vertex programs.
2006-09-27 09:46:08 +02:00
e4d5385d2c
wined3d: Cleanup ActiveRender some more.
2006-09-27 09:45:50 +02:00
cc821415ae
wined3d: Render upside down when rendering offscreen, even if the backbuffer is used to render to.
2006-09-27 09:45:34 +02:00
4bc8125648
wined3d: Show the MESSAGE in device_find_fbconfigs() only once.
2006-09-27 09:45:25 +02:00
581c24ef4e
wined3d: Use GL_EXTCALL.
...
That fixes compilation with gl headers that do not know about glUniform4fvARB.
2006-09-26 11:41:53 +02:00
4b55964a26
wined3d: Add the missing gamma cap.
2006-09-26 11:39:29 +02:00
9cafbd6de0
wined3d: Surface data is 32 bit aligned.
2006-09-25 18:31:26 +02:00
96bce8d6d4
wined3d: Avoid wasting a uniform.
2006-09-25 18:24:19 +02:00
674af50174
wined3d: Stop fixing up a VBO if the declaration changes too often.
2006-09-25 18:22:36 +02:00
615db2b93d
wined3d: Verify the VBO vertex declaration every draw.
2006-09-25 18:21:50 +02:00
0ce3c59477
wined3d: Fix a typo.
2006-09-25 18:21:04 +02:00
7c86d91bb9
wined3d: glBlend* fixes.
2006-09-25 17:56:04 +02:00
b421b60874
wined3d: Allow null streams in the vertex declaration.
2006-09-21 19:57:12 +02:00
fd65b9b413
wined3d: Do not bind the 0 vbo when vbos are unsupported.
2006-09-21 11:14:52 +02:00
6192f77d25
wined3d: Clamp the light exponent at 128.
2006-09-20 20:03:46 +02:00
32ab895e46
makefiles: Generate the dependencies line to avoid some code duplication.
2006-09-14 09:38:16 +02:00
f2aee453f1
wined3d: Avoid crashing when renderer returns no name.
2006-09-13 11:37:06 +02:00
87fe835f5b
wined3d: Cleanup the surface loading code a bit.
...
- Separate allocation and uploading of textures.
- Move common code for allocating, uploading and downloading textures
into separate functions.
- Set the correct format and type for DXT textures.
2006-09-12 10:52:59 +02:00
6286c4e70d
ddraw: Pass the fullscreen flag to wined3d.
2006-09-10 10:18:45 +02:00
06f9532dda
Assorted spelling fixes.
2006-09-08 11:04:53 +02:00
db7b684d30
wined3d: Simplify setting the stencil renderstate.
2006-09-07 16:11:21 +02:00
2e1cf4d948
wined3d: Add support for R32F and R16F texture formats.
2006-09-07 13:48:32 +02:00
de54843d7b
wined3d: Remove unused field: Surface.textureName.
2006-09-07 13:47:25 +02:00
448f918a39
wined3d: Clean up ActiveRender.
2006-09-07 13:47:13 +02:00
4a581e6030
wined3d: Avoid crashing when ProcessVertices is called with NULL vertex declaration.
2006-09-07 13:46:45 +02:00
d1d5f4b646
wined3d: Implement BlendFactor renderstate.
2006-09-07 13:44:02 +02:00
c33e6245b5
wined3d: Remove unnecessary glBlendColor in TextureFactor renderstate.
2006-09-07 13:43:53 +02:00
bc449ca31f
wined3d: Apply the half pixel correction for shaders too.
2006-08-29 12:26:15 +02:00
bda6d092a5
wined3d: Add support for A16B16G16R16F and A32B32G32R32F texture formats.
2006-08-28 11:46:20 +02:00
760456dc7f
wined3d: Find the correct sampler type for < 2.0 pshaders.
2006-08-28 11:37:24 +02:00
252a0a76d4
wined3d: Properly initialize a variable.
2006-08-28 11:37:11 +02:00
fd15b8d064
wined3d: Use a common function for all D3DCMPFUNC -> GLenum conversions.
2006-08-25 20:04:56 +02:00
d4a88724dd
wined3d: Load projected textures in fragment shaders.
2006-08-25 11:19:15 +02:00
0b7a96e92b
wined3d: Compile pixel shaders in drawprim.
2006-08-25 11:19:08 +02:00
e0b21688fa
wined3d: Make the destination surface glDirty in UpdateSurface.
2006-08-23 16:54:18 +02:00
d7f94bf7c9
wined3d: Correctly draw transformed and untransformed vertices in the same scene.
2006-08-22 12:53:53 +02:00
a39e2b51cb
wined3d: Don't pass bad values to glAlphaFunc and glDepthFunc.
2006-08-21 12:23:41 +02:00
4c88bb84b9
wined3d: Print real unhandled D3DCMPFUNC value.
2006-08-21 12:23:02 +02:00
de97fa7a3b
wined3d: Better GPU detection.
2006-08-21 12:21:19 +02:00
09eb0c40a6
wined3d: Improve float constant loading a bit.
...
- Use a list to keep track of what constants are set.
- Move TRACEs and checkGLcall calls out of the main constant loading loop.
2006-08-21 12:17:42 +02:00
49f4c68e29
wined3d: Lookup GLSL float uniform locations only once per program.
2006-08-21 12:16:27 +02:00
efa5f78598
wined3d: Free the float constant map arrays for all stateblocks.
2006-08-21 12:16:06 +02:00
2358fbbb03
wined3d: Fix indices for the float constant map.
...
Indices for the float constant map should be multiplied by 4 because
we're loading 4 component float vectors, not because the size of a
float is 4.
2006-08-21 12:15:12 +02:00
f50bb771c9
wined3d: Make sure b_info structure is properly allocated and released.
2006-08-17 11:20:33 +02:00
ce5c4d38c4
wined3d: Silence WINED3DRS_DEBUGMONITORTOKEN.
2006-08-16 16:43:32 +02:00
ef1c8fd118
wined3d: Fix vertex shader corruption issue.
2006-08-14 11:45:33 +02:00
1a3359884c
wined3d: Fix opengl extension call.
2006-08-11 11:56:36 +02:00
387c982d5c
wined3d: Fix spelling in a comment.
2006-08-11 11:55:27 +02:00
2628627e79
wined3d: Surface pitch fix.
2006-08-10 10:54:59 +02:00
31abc2febd
wined3d: Draw buffers support.
2006-08-10 10:54:50 +02:00
30ef7f0b08
wined3d: Minor cursor fixes.
2006-08-10 10:54:37 +02:00
c2b6cc9dc4
wined3d: Fix GLSL regression / draw buffers support.
2006-08-09 20:35:59 +02:00
bfbcfd2234
wined3d: Watch out for negative results when validating the shader constant range.
2006-08-09 20:35:02 +02:00
c856432fab
wined3d: Volume texture addressing caps.
2006-08-08 19:37:30 +02:00
eba1f90ef6
wined3d: Shader declaration cap fixes.
2006-08-08 19:37:23 +02:00
194cdfa4b0
wined3d: Shader cap fixes.
2006-08-08 19:35:24 +02:00
ccf0d11352
wined3d: Stub out remaining renderstates.
2006-08-08 11:21:17 +02:00
f5d9b221cf
wined3d: Correct check for GL ext. support in MULTISAMPLEANTIALIAS.
2006-08-08 11:21:10 +02:00
f02af24039
wined3d: Add missing newline at the end of traces.
2006-08-08 11:20:15 +02:00
4d6cfb6351
wined3d: Registry setting for the amount of simulated texture memory.
...
Set VideoMemorySize under HKCU\Software\Wine\Direct3D to amount in MB
as string.
2006-08-08 11:20:05 +02:00
91998b4d99
wined3d: Textureops caps fix.
2006-08-08 11:15:07 +02:00
3d2ae69102
wined3d: Allow async occlusion queries.
2006-08-07 19:59:49 +02:00
008c23d06a
wined3d: Improve a few query traces.
...
The query type is useful to have in query TRACEs.
IWineD3DQueryImpl_GetDataSize isn't really a stub.
2006-08-07 19:42:54 +02:00
44c1747f71
wined3d: Check Occlusion query GL calls.
2006-08-07 19:42:39 +02:00
02a8f74490
wined3d: Add a couple of traces to the vertexdeclaration creation code.
2006-08-07 19:42:31 +02:00
ce9b4baad8
Assorted spelling fixes.
2006-08-07 13:52:55 +02:00
930a9a1d02
wined3d: texture caps fixes.
2006-08-07 13:52:38 +02:00
bd6f0b23d6
wined3d: General constant caps fix.
2006-08-07 13:52:03 +02:00
219ca7c2a0
wined3d: Fix D3DCOLOR swizzling in shaders.
2006-08-07 13:12:21 +02:00
ef87a40c72
wined3d: Delay vertex shader compilation until the shader is first used.
2006-08-07 13:12:10 +02:00
3d9e96f3bc
wined3d: Volume textures fix.
2006-08-05 11:26:25 +02:00
6ded5542b2
wined3d: Raster caps fix.
2006-08-05 11:26:06 +02:00
6fedd6c041
wined3d: Primitive misc caps fix.
2006-08-05 11:25:51 +02:00
9925b0561e
wined3d: Basetexture anisotropic fix.
2006-08-04 20:48:08 +02:00
95b047c2fe
wined3d: Fix a number of badly reported caps.
2006-08-04 20:47:50 +02:00
a7c2ab3e90
wined3d: Surface pitch fix.
2006-08-04 11:59:00 +02:00
ea905eab09
wined3d: Disable vertex arrays after we're done drawing from them.
...
After drawing from a vertex array we should disable them, to prevent
the next draw calls from potentially reading past their ends. This
also moves the disabling of vertex attrib arrays (for shaders) into
its own function.
2006-08-04 11:58:43 +02:00
c0c525d458
wined3d: Paletted texture support.
2006-08-03 18:20:37 +02:00
13557abb7f
wined3d: Fix potential NULL dereference in IWineD3DSurfaceImpl_LockRect.
2006-07-31 17:20:15 +02:00
92bc96a96b
wined3d: Avoid NULL dereference.
2006-07-31 17:20:05 +02:00
d5238cfb38
wined3d: Split the GLSL check in a check for GLSL vertex shaders and one for GLSL fragment shaders.
2006-07-31 10:53:05 +02:00
c6c6cf1f51
wined3d: Improve IWineD3DDeviceImpl_CreateTexture trace.
2006-07-31 10:53:00 +02:00
56395ca5f3
wined3d: Use GL_LIMITS(samplers) instead of GL_LIMITS(sampler_stages) in IWineD3DSurfaceImpl_UnlockRect.
2006-07-31 10:52:55 +02:00
e5fc18a505
wined3d: Skip processing of D3DSIO_PHASE instruction.
2006-07-29 11:50:10 +02:00
2e52b36bb3
wined3d: Declare a 1D sampler for TEXDP3TEX (GLSL).
2006-07-29 11:50:02 +02:00
d353ab7879
wined3d: Start checking for D3DUSAGE_QUERY_* items, improve traces.
2006-07-29 11:49:51 +02:00
dc743d82ff
wined3d: Optimize d3dfmt_convert_surface.
2006-07-29 11:49:03 +02:00
72bfe131d1
wined3d: More shader fixes / new instructions.
...
- Replace gl_FragColor with gl_FragData[0] for GLSL pixel shader output.
- Subtract 1 more constant from total GLSL allowed float constants to
accommodate the PROJECTION matrix row that we reference.
2006-07-28 14:01:16 +02:00
6d16eff9a6
wined3d: Render target texturing.
2006-07-28 14:01:07 +02:00
65e5ed60ae
wined3d: Do not use the IWineD3DSurface for the cursor.
2006-07-28 12:31:57 +02:00
0fbc1fc0df
wined3d: Avoid a false ERR.
2006-07-28 12:28:19 +02:00
0312a30676
wined3d: Fix minor typo from shader patch.
2006-07-27 14:40:01 +02:00
46c4b88ba5
wined3d: Fix some upside-down rendering issues for shaders.
2006-07-27 12:03:25 +02:00
3127d6401a
wined3d: BltFast/BltOverride color keying.
2006-07-27 12:02:16 +02:00
3588067b90
wined3d: Blacklist WINED3DFMT_R8G8B8.
2006-07-27 11:57:45 +02:00
de051649c3
wined3d: Fix CopyRects if pDestPointsArray is NULL.
2006-07-26 15:40:39 +02:00
3b10a021db
wined3d: More efficient color keying dirtifying.
...
Instead of blindly dirtifying the surface LoadTexture keeps track of
the color key that was used when creating the opengl texture and
reloads the surface if the color key has changed.
2006-07-26 15:21:00 +02:00
06106e2810
ddraw: Support using an application-provided surface pointer.
2006-07-26 15:17:59 +02:00
a5142837c6
wined3d: Enable all bump mapping formats.
2006-07-26 10:24:37 +02:00
f6b88b93ad
wined3d: Fix crash caused by bad TRACE.
2006-07-26 10:24:27 +02:00
5ca9f82661
wined3d: Remove superfluous breaks.
2006-07-26 10:24:15 +02:00
7e90aba97b
wined3d: Implement more GLSL instructions.
...
Implement D3DSIO_TEXREG2AR, TEXREG2GB, TEXREG2RGB, TEXM3X3TEX, TEXM3X3SPEC.
2006-07-25 11:22:55 +02:00
536638918d
wined3d: Add real occlusion query support.
2006-07-25 11:22:00 +02:00
8c981140a2
wined3d: Add traces to IWineD3DVertexShaderImpl_SetFunction & IWineD3DPixelShaderImpl_SetFunction.
2006-07-25 11:21:51 +02:00
2d6e661fbe
wined3d: D3d8 shaders can have a NULL pFunction, but a valid vertex declaration.
2006-07-25 11:21:46 +02:00
ac8f2c033c
wined3d: Improve traces for D3DTRANSFORMSTATETYPE.
...
Added debug function for WINED3DTRANSFORMSTATETYPE and changed all
references from D3DTS_* to WINED3DTS_*.
2006-07-24 19:55:27 +02:00
a98ccb543d
wined3d: Draw the cursor.
2006-07-24 13:27:15 +02:00
14c2aa0ed6
wined3d: Use the ddraw blitting code for IWineD3DDevice::ColorFill.
2006-07-24 13:27:15 +02:00
75950b5bf8
wined3d: Replace memset/memcpy routines on stateblock (fixes dynamic shader constants regression).
2006-07-24 12:57:34 +02:00
127613bc6f
wined3d: Whitelist pixelformats instead of blacklisting.
2006-07-24 12:57:34 +02:00
a64febd3d1
wined3d: Reactivate the X bits fixup.
2006-07-24 12:57:33 +02:00
3c03ae2f84
wined3d: Minor trace corrections in Set___ShaderConstants().
2006-07-21 20:22:19 +02:00
9423fd2d9f
wined3d: Do not try to create a vbo more than once.
2006-07-21 20:21:00 +02:00
d637aa3581
wined3d: Move vertex fixups into their own function.
2006-07-21 20:20:54 +02:00
99f67c676b
wined3d: Respect EnableAutoDepthStencil parameter.
2006-07-21 10:54:43 +02:00
99272f0dee
wined3d: Correct initial render states.
2006-07-21 10:54:12 +02:00
65109002ae
wined3d: Do not return WINED3DERR_INVALIDCALL for Phong shading.
2006-07-21 10:53:54 +02:00
0c6c9f04a7
wined3d: Restore recording mode later in ActiveRender().
2006-07-21 10:53:34 +02:00
b77b72c91b
wined3d: Read shader constants from correct stateblock.
2006-07-21 10:53:01 +02:00
a8f2c1075a
wined3d: Compilation fixes.
2006-07-20 12:11:06 +02:00
718716b77a
wined3d: Make the number of floating point shader constants dynamic.
2006-07-19 09:54:30 +02:00
bffe5a6922
ddraw/wined3d: Remove texture format enumeration functions.
2006-07-18 11:25:22 +02:00
9740555d83
wined3d: Duplicate flips in software if the local copy is up to date.
2006-07-18 11:24:51 +02:00
9a9a14d4f5
wined3d: Disable the fog before writing the back buffer data.
2006-07-18 11:24:08 +02:00
739d565c59
wined3d: Add a setting for the render target locking method.
2006-07-18 11:22:51 +02:00
f8ca32b3fb
wined3d: Break the glDrawPixels call out of UnlockRect.
2006-07-18 11:22:09 +02:00
2dc451e181
wined3d: Readd missing copyright to shaders files.
2006-07-18 11:10:34 +02:00
95ac88cc0b
wined3d: Fix typo in ARB pixel shader.
2006-07-18 11:10:23 +02:00
593541a50c
wined3d: Increment texture_idx when continuing as well.
2006-07-18 11:09:46 +02:00
6a97f2202e
wined3d: Fix for vertex shaders.
2006-07-17 15:05:38 +02:00
ecbb53a723
wined3d: Break out the frame buffer readback of LockRect, implement palettized readback.
2006-07-17 15:05:38 +02:00
5702a310e9
wined3d: Allocate 4 extra bytes in the dib section.
2006-07-17 13:51:12 +02:00
494841d3e5
wined3d: Only copy memory corresponding to the dib section instead of the power of 2 surface.
2006-07-14 13:32:40 +02:00
436d700c2e
wined3d: Fix cmp instruction for GLSL.
...
The current GLSL cmp instruction is incorrect, because:
- it ignores destination write mask
- it ignores source swizzle
- it ignores other source modifiers.
- it works incorrectly for src0 = 0
2006-07-14 13:32:38 +02:00
07eb6531a3
wined3d: Fix light state bugs.
2006-07-14 12:39:13 +02:00
0924f969d1
wined3d: Texture stages that reference NULL textures should just pass
...
through the result of the previous stage.
2006-07-12 13:21:04 +02:00
7090259545
wined3d: Fix specular color handling for register combiners.
...
By default the FinalCombiner is setup to add the specular color to the
final result of the combiner operations. However, it should only do
this when the WINED3DRS_SPECULARENABLE renderstate is enabled.
2006-07-12 13:20:41 +02:00
0dd13f2cb7
wined3d: Check the color data type too when deciding whether to convert data.
2006-07-12 13:20:25 +02:00
ed9848930b
wined3d: Improve GetAdapterMonitor stub.
2006-07-11 17:14:46 +02:00
33293df143
wined3d: More flow control instructions.
...
- Implement call, callnz, label, and ret
- Implement support for NOT modifier
2006-07-11 17:14:24 +02:00
6ede56495a
wined3d: More flow control instructions
...
- Implement if, else, endif, rep, endrep, break
- Implement ifc, breakc, using undocumented comparison bits in the instruction token
- Fix bug in main loop processing of codes with no dst token
- Fix bug in GLSL output modifier processing of codes with no dst token
- Fix bug in loop implementation (src1 contains the integer data, src0 is aL)
- Add versioning for all the instructions above, and remove
GLSL_REQUIRED thing, which is useless and should be removed from all
opcodes in general.
2006-07-11 17:13:05 +02:00
345dd49eda
wined3d: Fix off-by-one constants bug.
2006-07-11 17:12:24 +02:00
8068fc3b9c
wined3d: Clamp texcoord output between 0 and 1.
2006-07-11 17:12:04 +02:00
e9de563e41
wined3d: Place immediate constants in the same array as global constants.
...
- move DEF, DEFI, DEFB handling into the register counting pass
- keep track of defined constants as a linked list (because there's a
few of them)
- apply immediate constants after global constants in the constant
loading function
- both types of constants now get loaded with array notation in the
shader (into the same array)
2006-07-11 17:11:30 +02:00
2ce792fd33
wined3d: Add an "\n" to a fixme to fix another overflow (in IWineD3DImpl_CheckDeviceFormatConversion).
2006-07-11 12:41:29 +02:00
5258e061dc
make_dlls: Ignore generated import libraries from the top-level .gitignore.
2006-07-10 20:55:58 +02:00
cc2b3b48e6
Take advantage of the recursive nature of .gitignore for Makefile entries.
...
Prefix other entries with '/' to make them non-recursive.
2006-07-10 20:47:54 +02:00
c58e06548e
wined3d: Fix typo breaking 3.0 pshaders color input.
2006-07-10 11:48:11 +02:00
eb527c82e2
Add a common fps counter channel to ddraw, opengl and d3d.
2006-07-07 17:52:46 +02:00
5638fac685
wined3d: Trace ABS/ABSNEG modifiers.
2006-07-07 17:40:03 +02:00
899c8cdb64
wined3d: Create fake input semantics for d3d8 shaders.
...
Use them to remove the need for loading arrays in two different places.
2006-07-07 17:39:52 +02:00
5b3c500efe
wined3d: Reverse semantics maps for shaders.
2006-07-07 17:39:26 +02:00
c611012df5
wined3d: Make WINED3D_ATR macros more flexible.
...
Make them operate on a type, as opposed to a semantic name.
2006-07-07 17:37:25 +02:00
c202bfe40d
wined3d: Simplify primitiveDeclartationConvertToStrided.
...
Assign fixed indices to declaration inputs.
Then use a common path to load the strided data.
2006-07-07 17:36:24 +02:00
85aa8ab855
wined3d: Add position_transformed flag to Strided data format.
2006-07-07 17:35:36 +02:00
fc2611d4a8
wined3d: Only link and use GLSL program if at least one GLSL shader is available.
2006-07-07 17:28:21 +02:00
c562c4c771
wined3d: Fix D3DSIO_TEXKILL for GLSL.
2006-07-07 16:57:51 +02:00
00e779370f
janitorial: Put "inline static" at the beginning of a declaration.
2006-07-07 14:30:35 +02:00
32b1a24501
janitorial: Move the storage specifier to the beginning of the declaration.
2006-07-07 14:30:35 +02:00
3529e0ceeb
wined3d: Fix D3DSIO_M#X# instruction for both ARB and GLSL shaders.
...
This instruction was being handled incorrectly in the case where the
2nd src argument contained a relatively addressed constant.
2006-07-06 16:31:24 +02:00
0472e9cd49
wined3d: Clean up drawPrimitive/drawPrimitiveDrawStrided.
2006-07-06 16:07:38 +02:00
1309844913
wined3d: Implement FVF to DECL9 conversion (with tests).
2006-07-06 16:07:38 +02:00
276609e1e5
wined3d: Move register count pass to SetFunction.
...
Move semantics pointers out of the reg_maps, make them persistent data
in the shader (again, for future software shaders).
2006-07-06 16:07:38 +02:00
bbe7b40a71
wined3d: Fix STREAM flag override.
2006-07-06 16:07:38 +02:00
e260e9fd98
wined3d: Add missing PSIZE register for decl8->9 conversion.
2006-07-06 16:07:38 +02:00
b324fc0fdb
wined3d: Allow mix of SW vertex and GLSL pixel shader.
...
Do not attach non-GLSL shaders to the GLSL program, that will cause a
crash. Mix with ARB shaders is never going to happen, because the
selection code will always choose GLSL for both or ARB for both.
2006-07-06 16:07:37 +02:00
771623692e
wined3d: Rework shader mode selection.
...
- currently half the shader selection code (GLSL vs ARB) is in
fillGLcaps. The parts that check for software shaders are in
GetDeviceCaps. That placement, will work, but is definitely not optimal.
FillGLcaps should detect support - it should not make decision as to
what's used, because that's not what the purpose of the function is.
GetDeviceCaps should report support as it has already been selected.
Instead, select shader mode in its own function, called in the
appropriate places.
- unifying pixel and vertex shaders into a single selection is a
mistake. A software vertex shader can be coupled with a hardware arb or
glsl pixel shader, or no shader at all. Split them back into two and add
a SHADER_NONE variant.
- drawprim is doing support checks for ARB_PROGRAM, and making shader
decisions based on that - that's wrong, support has already been
checked, and decided upon, and shaders can be implemented via software,
ARB_PROGRAm or GLSL, so that support check isn't valid.
- Store the shader selected mode into the shader itself. Different types
of shaders can be combined, so this is an improvement. In fact, storing
the mode into the settings globally is a mistake as well - it should be
done per device, since different cards have different capabilities.
2006-07-06 16:07:37 +02:00
1a82976908
wined3d: Flip WINED3DFMT_R8G8B8 to GL_RGB.
2006-07-06 12:45:27 +02:00
7e9fd0b4c1
wined3d: Add a function to print out D3DDECLUSAGE9 values.
2006-07-03 12:04:37 +02:00
0111e15e1f
wined3d: Fix faulty DCL trace.
2006-07-03 12:04:23 +02:00
1bfec25031
wined3d: Resync ARB mnxn function with GLSL mnxn function.
2006-07-03 12:04:09 +02:00
fd896d8652
wined3d: Use shader_get_regtype() in register counting pass.
2006-07-03 12:03:58 +02:00
d06e13db99
wined3d: Move SHADER_ARB code into arb_program_shader.c.
2006-07-03 12:03:31 +02:00
fce0c625f0
wined3d: Cleanup: print constants in device code.
2006-07-03 12:02:04 +02:00
77448f588b
wined3d: Perform sanity checks on the rectangle in LockRect.
2006-06-30 20:44:27 +02:00
4fbe97e5e7
wined3d: Fix a few GLSL shader instruction translations.
...
This fixes the translations for a few instructions in GLSL and allows
Cubemap sampling in pixel shaders < 2.0. It makes some of the
lighting on textures in Half Life 2 look better, including some of the
water effects. It's not perfect yet, but much closer now.
2006-06-29 14:41:01 +02:00
7f9e61f7d2
wined3d: Use register combiners for texture stage operations.
...
Make wined3d use register combiners for texture stage operations. In
order to do that the texture unit index needs to be separated from the
texture stage index. For cards that don't support the
NV_register_combiners extension nothing should change.
2006-06-28 16:34:36 +02:00
f3a2a9f30a
wined3d: Add code for using register combiners for texture stage operations.
...
On nVidia cards the value of GL_MAX_TEXTURE_UNITS is generally not
larger than 4. In Direct3D that would correspond to
MaxSimultaneousTextures in the caps, rather than MaxTextureBlendStages
(which can be much larger) to which it currently corresponds in
wined3d. Using register combiners we can get around that limitation
and get up to GL_MAX_GENERAL_COMBINERS_NV (typically 8) texture
stages. This patch adds code for doing the texture operations with
register combiners instead of ARB_texture_env_combine or
NV_texture_env_combine4, but doesn't make use of that code yet. That's
what the next patch will do.
2006-06-28 16:08:36 +02:00
ac98d566ac
wined3d: Fix uploading of textures for shaders.
...
The code for uploading / binding textures for use with pixel shaders
is slightly different from the one for uploading / binding textures
for use with the fixed function pipeline. It would be possible to keep
the code in a single function with a couple of conditionals, but in
combination with the changes needed for register combiners that would
become quite messy.
2006-06-28 16:08:17 +02:00
a54e36adfe
wined3d: Texture limits fixes.
...
GL_LIMITS(textures) is currently used for both the number of texture
stages and the maximum number of simultaneous textures. In the current
code that's the same, but in a later patch that will be separated,
since a texture stage doesn't have to reference an actual
texture. Also, shaders can access a larger number of samplers than the
number of texture units the fixed function pipeline can access.
2006-06-28 16:06:25 +02:00
085e20c0da
wined3d: Add & use D3DTEXTUREOP dumping code.
2006-06-28 15:43:53 +02:00
cea41b0a0f
wined3d: Vertex buffer can be locked multiple times.
2006-06-27 21:14:02 +02:00
baf38b3007
wined3d: Implement more GLSL instructions and a little cleanup.
...
- Implement D3DSIO_DP2ADD, D3DSIO_TEXKILL, D3DSIO_TEXM3X3PAD
- Partially implement D3DSIO_TEXBEM, D3DSIO_TEXM3X3VSPEC (as much as
they are implemented in ARB_fragment_program at least).
- Stop copying the SHADER_PARSE_STATE struct in each ARB shader
routine - use a pointer instead.
2006-06-27 11:16:10 +02:00
3489f1b9b1
wined3d: Remove some redundant code.
2006-06-27 11:15:54 +02:00
f460b38612
wined3d: Fix compilation (VBO constants).
2006-06-27 11:15:47 +02:00
9bfbfcbeb4
Assorted spelling, case and grammar fixes.
2006-06-26 13:06:11 +02:00
e18b89aca7
wined3d: Fix single buffering.
...
Tell gl to draw to the back buffer when a back buffer is used, do not
use the value from gl.
2006-06-26 13:03:56 +02:00
2a40642804
wined3d: Fix a bad trace.
2006-06-26 13:03:43 +02:00
2122026713
wined3d: Create vertex buffer objects for D3D vertex buffers.
2006-06-26 13:03:08 +02:00
232dfc9b3a
wined3d: Vertex fixups.
2006-06-26 13:02:36 +02:00
7d31ab95e4
wined3d: Add support for VBOs to the drawing code.
2006-06-26 13:02:19 +02:00
495e46197a
ddraw/wined3d: IDirectDrawSurface7::SetSurfaceDesc corrections.
2006-06-26 12:38:55 +02:00
3518747165
wined3d: Pixel format cleanup.
2006-06-21 12:15:50 +02:00
6601e8eefe
wined3d: Add an "\n" to a fixme to fix an overflow.
2006-06-21 11:16:15 +02:00
e0ccbeb282
wined3d: Bind correct number of samplers for GLSL shaders.
...
We are only checking against GL_MAX_TEXTURES when binding samplers,
when we should be checking against the maximum number of samplers that
the card supports. Spotted by H. Verbeet.
2006-06-21 11:16:07 +02:00
0b09ecb291
wined3d: Move D3DSIO_DEF instruction for ARB shaders into arb_program_shader.c.
2006-06-20 11:28:15 +02:00
99c855e6ae
wined3d: Fix DEF instructions in GLSL for non-Nvidia platforms.
...
- NVidia allows "const vec4 = {1.0, 2.0, 3.0, 4.0};", even though
that's not part of the spec.
- It should be "const vec4 = vecr4(1.0, 2.0, 3.0, 4.0);"
- This patch fixes this for D3DSIO_DEF and D3DSIO_DEFI.
2006-06-20 11:28:05 +02:00
c13f097de3
wined3d: Correct implementation of D3DSIO_LOOP.
...
I initially misread the specification. src0.x is the iteration count,
not the max amount for the loop register. This fixes that.
2006-06-19 11:11:45 +02:00
fd83de7129
wined3d: Fix lookup for LOOP register.
2006-06-19 11:11:24 +02:00
9afa540eb5
wined3d: Added correct cast support for gl_FogFragCoord and gl_PointSize output registers.
2006-06-19 11:11:05 +02:00
406ec20459
wined3d: Load boolean and integer constants into the GLSL shader program.
2006-06-19 10:59:58 +02:00
f444009bfb
wined3d: Implement locally defined boolean and integer constants in GLSL.
2006-06-19 10:59:13 +02:00
34d271bab6
wined3d: Add preliminary support for constant boolean and integer registers in GLSL.
...
- Separate the declaration phase of the shader string generator into
the arb and glsl specific files.
- Add declarations and recognition for application-sent constant
integers and booleans (locally defined ones will follow).
- Standardize capitilization of pixel/vertex specific variable names.
2006-06-19 10:50:14 +02:00
2d8e05f8a1
wined3d: Move constant loading into target-specific files.
...
- Moves GLSL constant loading code into glsl_shader.c and out of the
over-populated drawprim.c.
- Creates a new file named arb_program_shader.c which will hold code
specific to ARB_vertex_program & ARB_fragment_program.
- Remove the constant loading calls from drawprim.c
2006-06-19 10:49:52 +02:00
7f18b4e5fa
wined3d: Remove dead vertex shader code.
2006-06-19 10:39:36 +02:00
edaac6f696
wined3d: GetScissorRect should use zero-based scissorBox (Coverity).
2006-06-16 14:42:36 +02:00
9eb81363ad
Add trailing '\n's to ok() calls.
...
Remove spaces before '\n'.
2006-06-16 11:32:42 +02:00
11ae0f6386
Assorted spelling fixes.
2006-06-16 11:32:29 +02:00
701ce97d65
wined3d: Add and use GL_EXT_fog_coord defines.
2006-06-16 11:29:31 +02:00
3862f8e3d7
wined3d: Support more than one back buffer.
2006-06-15 16:51:41 +02:00
5c3c5903a5
wined3d: Correct vertex fog for transformed vertices and correctly
...
handle non-vertex, non-table fog.
2006-06-15 12:24:09 +02:00
cc06ed3d53
wined3d: Implement more GLSL instructions.
...
- Implemented: D3DSIO_SGN, LOOP, ENDLOOP, LOGP, LIT, DST, SINCOS
- Process instruction-based modifiers (function existed, it just
wasn't being called)
- Add loop checking to register maps.
- Renamed "sng" to "sgn" for D3DSIO_SGN - it's not handled anywhere
except for GLSL, so won't matter.
2006-06-15 12:20:20 +02:00
836b5c7e93
wined3d: Use unsigned int instead of size_t to avoid printf format warnings.
2006-06-13 14:14:20 +02:00
45dbb78d73
wined3d: Fix params for DP2ADD/TEXLDD.
...
DP2ADD is valid on pshaders 2.0 and above, has 4 parameters.
TEXLDD is valid on pshaders 2.x and above, has 5 parameters.
2006-06-13 11:40:23 +02:00
8c6ee8df0d
wined3d: Mark instructions without a destination token.
...
There are a total of 17 instructions without a destination token. Of
those 9 have num_params != 0, which means that we will not process any
of them correctly, because we assume the first token (if present) is a
destination token.
Those are basically all the flow control instructions, which we plan to
support very soon. They have source tokens, and no destination. Add a
flag that marks them up to the ins table. Use this flag in the trace
pass, and generation pass.
2006-06-13 11:40:22 +02:00
14a52e5c09
wined3d: Keep pshader and vshader constants in GLSL separate.
...
GLSL uniforms have as scope the entire program.
To prevent conflicts, name pshader and vshader constants differently.
Based on a patch by Jason Green.
2006-06-13 11:40:22 +02:00
0d08316523
wined3d: Improve Sampler support on 2.0 and 3.0 shaders.
...
- track sampler declarations and store the sampler usage in reg_maps structure
- store a fake sampler usage for 1.X shaders (defined as 2D sampler)
- re-sync glsl TEX implementation with the ARB one (no idea why they diverged..)
- use sampler type in new TEX implementation to support 2D, 3D, and Cube sampling
- change drawprim to bind pixel shader samplers
Additional improvements:
- rename texture limit to texcoord to prevent confusion
- add sampler limit, and use that for samplers - *not* the same as texcoord above
2006-06-13 11:40:22 +02:00
e99926ee06
wined3d: Cast more things.
...
Anything with a swizzle has to be casted to vec4, or it won't work properly.
There's multiple ways to do this, for the moment pick the easiest one.
2006-06-13 11:40:22 +02:00
a1f4dfe4e3
wined3d: Add support for shader model 3.0 I/O registers.
...
SM 3.0 can pack multiple "semantics" into 12 generic input/output registers.
To support that, define temporaries called IN and OUT, and use those as
the output registers. At the end of the vshader, unpack the OUT temps
into the proper GL variables. At the beginning of the pshader, pack the
GL variables back into 12 IN registers.
2006-06-13 11:40:22 +02:00
1a3003338f
wined3d: Trivial cleanups
...
- compiler warnings and errors should be FIXME
- remove obsolete comment, and change variable type.
2006-06-13 11:40:22 +02:00
a42925ee09
wined3d: Register map cleanups.
...
Various cleanups:
- do not use DWORD as a bitmask, that places artificial limit of 32 on
registers
- track attributes that are used and declare only those
- move declarations function call in pshader/vshader to allow us to
insert pixel or vertex specific code between the declarations and
the rest of the code
- remove redundant 0 intializers
- remove useless continue statement
2006-06-13 11:40:22 +02:00
17b0d26c1e
wined3d: Share trace pass
...
Now that the declaration function is out of the way, the tracing pass,
which is very long and 100% the same can be shared between pixel and
vertex shaders.
The new function is called shader_trace_init(), and is responsible for:
- tracing the shader
- initializing the function length
- setting the shader version [needed very early]
2006-06-13 11:40:22 +02:00
9bae7755ab
wined3d: Rework dcl processing.
...
The new function is called in pass 2 (getister counting/maps), and
it's now in baseshader. It operates on all INPUT and OUTPUT registers,
which, in addition to the old vertex shader input declarations covers
Shader Model 3.0 vshader output and pshader input declarations. The
result is stored into the reg_map structure.
2006-06-13 11:40:21 +02:00
f144d58ac2
wined3d: The namedArrays code path is dead (always FALSE).
...
Delete the entire namedArrays code path and all its dependencies (one
of which is quite long - storeOrder in drawprim is always FALSE, for
example). Delete declaredArrays, and make its code path the default.
2006-06-13 11:40:21 +02:00
c6449b5a91
wined3d: Move a checkGLcall to it's gl call inside an "if".
2006-06-13 10:51:07 +02:00
7528fc0de1
wined3d: Fix stencil related render states.
2006-06-13 10:50:55 +02:00
cf8833c467
wined3d: Enable two sided stencil in the caps.
2006-06-13 10:46:29 +02:00
df3e078b20
wined3d: Also print the format like a fourcc if unknown in debug_d3dformat.
2006-06-13 10:35:14 +02:00
405e11ea62
wined3d: Cleanup GetSrcAndOpFromValue().
...
- Cleanup GetSrcAndOpFromValue().
- Use naming more consistent with the rest of the file.
2006-06-12 16:07:58 +02:00
d822496dee
wined3d: Map D3DSIO_DEF to it's GLSL generating function for vertex shaders.
2006-06-12 13:21:46 +02:00
dbfb3739aa
wined3d: Make all the local shader functions static.
2006-06-10 13:22:27 +02:00
e9cbc66e93
wined3d: Make the virtual table functions static where possible.
2006-06-10 13:15:32 +02:00
42dd4653e3
wined3d: Change fog output variable name for GLSL shaders.
2006-06-10 12:43:10 +02:00
e8c97e9421
wined3d: Fix regression from register maps switch for ARB shaders.
...
I missed a register mask in the move to share the shader_hw_def()
function between pixel and vertex shaders for ARB shaders. Fixed
that, and made the GLSL version use the same mask for consistency.
2006-06-10 12:43:02 +02:00
a09c941677
wined3d: Enable CND/CMP for SHADER_ARB.
2006-06-10 12:42:09 +02:00
621f075fb9
wined3d: Print out sampler state names.
2006-06-10 12:41:54 +02:00
d44d0b5edb
wined3d: Downgrade Get*Shader FIXME to TRACE.
2006-06-10 12:41:44 +02:00
08295f4cfc
wined3d: GLSL shader cleanup patch.
...
- Based on comments from H. Verbeet
- Changed the distinction from .rgba & .xyzw masks to only use .xyzw
in GLSL shaders. They are interchangeable, and only served to make
the trace look more intuitive, but they don't always apply as-is, so
we'll just leave everything to .xyzw.
- Got rid of the "UseProgramObjectARB(0)" call in drawprim. If there
is no shader set on the next primitive, then that primitive will
call UseProgramObjectARB(0) when it begins to draw.
2006-06-09 21:09:03 +02:00
d5d4568450
wined3d: Allow drawPrim to create and use the GLSL program.
2006-06-09 15:20:06 +02:00
b67cda248d
wined3d: Add GLSL helper functions to Device.
...
- Add functions to attach & detach shader objects, create and delete programs, and maintain the list of programs.
- Add a list of GLSL shader programs to the device which is initialized on Init3D(), and deleted on Release().
2006-06-09 15:19:52 +02:00
ca7976c34f
wined3d: Map vertex shader instructions to GLSL generating functions.
2006-06-09 15:19:09 +02:00
5798356d21
wined3d: Map pixel shader instructions to GLSL generating functions.
2006-06-09 15:19:02 +02:00
d59714b78c
wined3d: Prototype the GLSL functions for use with pixel and vertex shaders.
2006-06-09 15:14:34 +02:00
806aaa1287
wined3d: Added more declarations to GLSL.
...
- Declare more variable names for GLSL programs.
- Some of these won't need to be declared eventually, but it doesn't hurt to do it for now.
- Correct output name for pixel shaders (gl_FragColor instead of glFragColor).
2006-06-09 15:14:22 +02:00
ca70d13af4
wined3d: Unified float constant register mapping between ARB pixel and vertex shaders.
...
- Got rid of the separate constant maps.
- Side effect of this is that the map is a bit larger for pixel shaders than it needs to be
2006-06-09 14:36:50 +02:00
0c59ca6448
wined3d: Add the bulk of the GLSL string generation functions.
...
- Add a new file glsl_shader.c which contains almost every GLSL specific function we'll need
- Move print_glsl_info() into glsl_shader.c
- Move the shader_reg_maps struct info into the private header, and make it part of SHADER_OPCODE_ARG.
- Create a new shared ps/vs register map for float constants (future patch will make ARB programs use this, too)
2006-06-09 13:47:55 +02:00
1f1057fc9b
wined3d: Move constant loading out of DrawPrimDrawStrided() and enable
...
loading float constants for GLSL.
- DrawPrim is just too big of a function. This separates the passing
of constants to the shader into new functions.
- Fixes an off-by-one error when loading vertex declaration constants
(should be <, not <=)
- Adds a function for GLSL loading of constants (aka Uniforms)
- Adds a GLSL program variable to the stateblock and sets it to 0 (a
future patch will actually create this program)
2006-06-09 13:26:51 +02:00
ac46320f57
wined3d: TEXREG2GB is valid on pshaders 1.1.
2006-06-07 15:23:23 +02:00
83a9666f9c
wined3d: Fix NULL dereference in generator function.
2006-06-07 15:23:17 +02:00
4d66615bbb
wined3d: Fix missing light recording.
...
Write a light with the default parameters in disabled state if
capturing a missing light.
2006-06-07 15:20:00 +02:00
26978a4d2d
wined3d: Return the result of QueryInterface in GetContainer.
2006-06-07 11:48:00 +02:00
7b8bf46f3f
wined3d: Remove a redundant break.
2006-06-07 11:47:54 +02:00
Ivan Gyurdiev