Stefan Dösinger
511f9dfb2d
wined3d: Clean up SetMem.
2007-09-18 09:34:08 +02:00
Stefan Dösinger
e56c6610c6
wined3d: Clean up SetFormatDesc.
2007-09-18 09:34:08 +02:00
Stefan Dösinger
e2944175e5
wined3d: Base surface move, part 2.
2007-09-18 09:34:08 +02:00
Stefan Dösinger
d99143c251
wined3d: Move non-rendering surface specific code to the base class.
2007-09-18 09:34:08 +02:00
Stefan Dösinger
0c91610433
wined3d: Move resource methods to the base surface class.
2007-09-18 09:34:08 +02:00
Stefan Dösinger
8434060b7e
wined3d: Start of some surface cleanup.
...
This patch and the following intend to make the surface code more
manageable and are a preparation to add gl3 support. The code adds a
new IWineD3DBaseSurface surface type, which will contain the
non-rendering management code. IWineD3DSurface and IWineGDISurface
will be derived from IWineD3DBaseSurface, and IWineGL3Surface can be
added later.
2007-09-18 09:34:08 +02:00
Michael Stefaniuc
a5fdea0e6a
janitorial: Remove two fresh redundant NULL checks before HeapFree(). Found by Smatch.
2007-09-17 13:47:49 +02:00
Roderick Colenbrander
2374c456bc
wined3d: Add pbo support for compressed textures.
2007-09-17 12:10:40 +02:00
Roderick Colenbrander
f9002c2628
wined3d: Don't create a pbo for system memory surfaces.
2007-09-17 12:10:21 +02:00
Stefan Dösinger
3961491d15
wined3d: Do not invalidate the sysmem copy if a pbo exists.
2007-09-17 12:08:54 +02:00
Stefan Dösinger
f42f228621
wined3d: Do not allocate memory if there's a pbo.
2007-09-17 12:08:47 +02:00
Roderick Colenbrander
ad692f2a83
wined3d: Add PBO support for dynamically locked surfaces.
2007-09-13 11:00:47 +02:00
Stefan Dösinger
0ed81b20af
wined3d: Emulate D3DFMT_L6V5U5.
2007-09-12 12:09:56 +02:00
Roderick Colenbrander
12e942b135
wined3d: Move the memory code of LockRect to the end of the function.
...
This is needed for PBOs because for those memory allocation works differently.
2007-09-12 11:20:35 +02:00
Stefan Dösinger
41bf0d48db
wined3d: Fix WINED3DFMT_X8L8V8U8.
2007-09-11 13:48:15 +02:00
Roderick Colenbrander
63c06b4b38
wined3d: Fix ddraw-opengl surface free bug.
2007-09-10 16:47:49 +02:00
Stefan Dösinger
bb213f67a3
wined3d: Take the format into account when finding the clear value.
2007-08-31 11:25:46 +02:00
Francois Gouget
a116879507
Assorted spelling fixes.
2007-08-30 12:26:02 +02:00
Stefan Dösinger
a489aa488b
wined3d: Accept rendering to sublevels with backbuffer orm.
2007-08-30 11:57:18 +02:00
Stefan Dösinger
3b822b80fe
wined3d: Reject opengl accelerated blits with system memory surfaces.
2007-08-30 11:57:18 +02:00
Stefan Dösinger
0d749e8e26
wined3d: Clear unused channels on R32F and R16F textures on readback.
2007-08-30 11:57:18 +02:00
Stefan Dösinger
50c101135c
wined3d: Refuse to ReleaseDC the wrong DC.
2007-08-23 13:34:00 +02:00
Stefan Dösinger
ea283d3cba
wined3d: Refuse to lock locked surfaces.
2007-08-23 13:33:40 +02:00
Roderick Colenbrander
3c08b23024
wined3d: Fix a null pointer dereference.
2007-08-21 21:38:57 +02:00
Stefan Dösinger
86b991c851
wined3d: Fix R32F and R16F.
2007-08-17 12:01:38 +02:00
Stefan Dösinger
028729d102
wined3d: Fix WINED3DFMT_A4L4.
2007-08-16 11:35:06 +02:00
Roderick Colenbrander
e77da5ef8a
wined3d: Don't call ActivateContext between ENTER_GL/LEAVE_GL.
2007-08-07 12:36:32 +02:00
H. Verbeet
cfb07e7114
wined3d: Set SFLAG_INSYSMEM when WINED3DLOCK_DISCARD is passed to IWineD3DSurfaceImpl_LockRect.
2007-08-02 12:18:41 +02:00
Alexandre Julliard
af4b9bb85c
wined3d: Fix compiler warning.
2007-07-30 14:14:01 +02:00
Stefan Dösinger
d2016ff892
wined3d: Store the gl format table in the gl info structure.
2007-07-30 12:49:50 +02:00
Stefan Dösinger
a0131a3272
wined3d: Split up the format table.
2007-07-30 12:49:39 +02:00
Stefan Dösinger
59efd5c7ec
wined3d: Set the pow2 sizes in gl surface private setup.
2007-07-26 11:48:36 +02:00
Michael Stefaniuc
25707d4c5d
wined3d: Remove a return after a return. Found by Smatch.
2007-07-25 13:02:39 +02:00
Stefan Dösinger
9ba3f389f6
wined3d: Initialize surfaces at creation.
2007-07-10 13:30:31 +02:00
Michael Stefaniuc
0326da9dd5
wined3d: Remove superfluous casts of void pointers to other pointer types.
2007-06-27 12:53:37 +02:00
Stefan Dösinger
fb269f9210
wined3d: Depthfill blits are allowed between BeginScene and Endscene.
2007-06-22 13:42:51 +02:00
Stefan Dösinger
6e5a5d2736
wined3d: DDraw surfaces are QWORD aligned.
2007-06-14 13:22:52 +02:00
Stefan Dösinger
c9b8a79e0b
wined3d: Implement vertical refresh sync.
2007-06-14 13:21:54 +02:00
Stefan Dösinger
ef65b233c0
wined3d: Some render target->texture blit context handling.
2007-06-11 13:56:47 +02:00
Stefan Dösinger
a460a2df43
wined3d: Store the gl information in a per adapter structure and initialize it only once.
2007-06-11 13:51:06 +02:00
Francois Gouget
96c337f0a1
Assorted spelling fixes.
2007-06-07 19:24:32 +02:00
Phil Costin
e7578dca36
wined3d: Add support for loading gamma corrected textures.
2007-06-07 13:01:49 +02:00
Lei Zhang
f00670df61
wined3d: Various spelling fixes.
2007-06-06 13:40:01 +02:00
Chris Robinson
1e64bb93a4
wined3d: Add a few missing checkGLcall calls.
2007-06-05 12:19:10 +02:00
Kolbjoern Fredheim
cb8a8182d1
wined3d: Implemented converting X1R5G5B5 format to R5G5B5A1 to emulate color-keying.
2007-05-22 12:26:49 +02:00
Stefan Dösinger
093261b729
wined3d: Only addref clippers if one exists.
2007-05-11 11:26:40 +02:00
Stefan Dösinger
a90f650fd2
wined3d: Implement DDBLT_DEPTHFILL on the active depth stencil target.
2007-05-11 11:25:41 +02:00
Stefan Dösinger
e7b68eec34
ddraw: Use point filter for blit operations.
...
D3DTEXF_NONE is a special value for mipmapping which disabled
mipmapping, but it is not a valid mag / min filter parameter.
D3DTEXF_POINT is what we want
2007-05-11 11:21:29 +02:00
Francois Gouget
f999a9e433
wined3d: Add a missing '\n' to a trace.
2007-05-11 11:20:34 +02:00
Stefan Dösinger
c9bc4ee760
wined3d: Handle DDPCAPS_ALPHA.
2007-05-08 18:28:38 +02:00
Stefan Dösinger
0fb41a8845
wined3d: Make the blit -> flip work for windowed rendering.
2007-05-08 18:28:08 +02:00
Stefan Dösinger
d93e161b1f
d3d: Move clippers from DDraw to wined3d.
2007-05-08 18:27:44 +02:00
H. Verbeet
7b48db196f
d3d: Fix the surface locking rectangle validation.
2007-05-04 13:41:13 +02:00
Stefan Dösinger
61d1abb1c1
wined3d: Do not allocate surfaces unless needed.
2007-04-26 14:51:56 +02:00
H. Verbeet
5fddfd5bbc
wined3d: Use surface_get_gl_buffer where appropriate.
2007-04-17 11:12:43 +02:00
H. Verbeet
1b9a5ba682
wined3d: Add a function to determine if a surface is the front or the backbuffer for a swapchain, and return the corresponding GLenum.
2007-04-17 11:12:34 +02:00
Stefan Dösinger
725057da47
d3d: Remove dependency on ddraw.h header.
2007-04-16 13:20:15 +02:00
H. Verbeet
2423c9f003
wined3d: Dirtify the sampler used by IWineD3DSurface_PreLoad in IWineD3DSurfaceImpl_BltOverride.
2007-04-10 21:39:43 +02:00
H. Verbeet
75e91fa409
wined3d: Use the framebuffer blit extension to implement StretchRect.
2007-04-09 12:40:52 +02:00
H. Verbeet
c9b178b594
wined3d: Fixup FBO depth attachments when the depth attachment is larger than the render target.
2007-04-09 12:39:23 +02:00
Felix Nawothnig
e600f7d082
wined3d: Issue an error when the render target is read back without SFLAG_INDRAWABLE being set.
2007-04-09 12:17:17 +02:00
Felix Nawothnig
c0782603d0
wined3d: Allow np2 textures to be loaded for SFLAG_INDRAWABLE.
2007-04-09 12:15:56 +02:00
Stefan Dösinger
290f2eb146
wined3d: Add Filtering to IWineD3DSurface::Blt and handle it.
...
This is to allow StretchRect to pass the texture filter to WineD3D.
DirectDraw sets the texture filter to WINED3DTEXF_NONE, simmilar to all
other functions which do not need filtering.
2007-04-07 10:58:10 +02:00
Stefan Dösinger
4f5d33311b
wined3d: Use GL_APPLE_client_storage if available.
2007-04-02 11:34:12 +02:00
Stefan Dösinger
e25a16fda5
wined3d: General signed format correction without native signed formats.
...
Implement signed d3d formats for D3DFMT_V8U8 and D3DFMT_Q8W8V8U8 if no
suitable opengl signed format is supported.
2007-03-21 22:51:19 +01:00
Stefan Dösinger
ede01abee2
wined3d: Support GL_ATI_envmap_bumpmap for D3DFMT_V8U8.
2007-03-21 22:50:41 +01:00
Stefan Dösinger
fcb83e7111
wined3d: Activate a context before doing opengl calls.
2007-03-19 12:22:57 +01:00
Erich Hoover
01199072dd
wined3d: Fix LockRect memory location calculation for WINED3DFMT_DXT*.
2007-03-17 19:51:34 +01:00
Stefan Dösinger
0b46254b57
wined3d: Blitting to offscreen target.
...
Fix the NULL deref that occured when blitting to offscreen targets and
select the proper gl drawing buffer instead.
2007-03-15 12:14:39 +01:00
Erich Hoover
9795e6839f
wined3d: Allow SetCursorProperties on existing cursor.
2007-03-14 13:14:08 +01:00
Stefan Huehner
4d1d01f266
Mark several functions as static.
2007-03-13 13:35:12 +01:00
Fabian Bieler
8dae597f24
wined3d: Implemented signed texture formats via NV_TEXTURE_SHADER.
2007-03-13 11:51:56 +01:00
Stefan Dösinger
c54a0fc2cf
wined3d: Rework surface dirtification.
...
Previously the surfaces stored a flag if the system memory copy was
ahead of the gl copy(SFLAG_DIRTY) or the gl copy is
ahead(SFLAG_GLDIRTY). The pbuffer copy was 'managed' differently using
SFLAG_INPBUFFER and SFLAG_INTEXTURE.
This patch replaces them with 3 flags, INSYSMEM, INPBUFFER and
INTEXTURE which specify which copy contains the most up to date
copy. It is perfectly valid to have more than one of those flags
set. One must be set at least (except at init, when no content is in
the surface yet). When one copy is modified, the flags for the others
are removed.
2007-03-07 12:18:14 +01:00
Stefan Dösinger
ebe274feed
wined3d: Remove IWineD3DSurface::SetPBufferState.
...
The method is removed because it does not really help with
anything. It should not be exported from wined3d, there is no need for
the other libs to call it. It does not help abstraction and code
simplification in any way because it is very specific and the code
calling it has to know what is happening in the surface to use this
method.
2007-03-07 12:17:33 +01:00
Stefan Dösinger
daeffc897b
wined3d: Use an aux buffer as blitting helper if available.
...
This helps performance a bit because the function does not have to
wait for the 2nd read to finish before returning. Only do that if we
have an aux buffer to mess with for free though.
2007-03-06 22:16:44 +01:00
Stefan Dösinger
ae57138eae
wined3d: WINED3DFMT_U8V8 is signed.
...
Plain OpenGL does not provide any signed pixel formats, so the
unsigned GL_RGB is used for loading perturbation data into pixel
shaders that use texbem. For correct loading, the signedness has to be
considered.
2007-03-06 22:16:12 +01:00
Stefan Dösinger
424d34f84f
wined3d: Use the source surface's texture for writing the backup.
...
The hwstretch blit code creates a new texture each time it is called
to back up the back buffer and releases it afterwards. It is more
efficient to keep the texture and release it with the surface.
2007-03-01 11:39:52 +01:00
Stefan Dösinger
8d9a553d89
wined3d: Support for using auxilliary buffers for offscreen rendering.
...
OpenGL AUX buffers provide a way for offscreen rendering which is very
similar to our back buffer "offscreen" rendering emulation. Not all
card support aux buffers, but if they are available they are a nice
present which is easy to use.
2007-02-28 21:04:47 +01:00
Francois Gouget
93494f2ac0
Assorted spelling fixes.
2007-02-20 20:30:51 +01:00
Stefan Dösinger
7676462a3d
wined3d: Fix d3d8/9 style palettes.
2007-02-20 11:46:20 +01:00
Stefan Dösinger
5e37345b30
wined3d: Activate a different context if the active render target is destroyed.
2007-02-19 13:10:51 +01:00
Stefan Dösinger
1f32d6235e
wined3d: Convert the full surface for now.
...
Until we have proper subrectangle handling for offscreen surfaces,
surface conversion has to use the real surface sizes, and not the size
of the opengl subrectangle that it is going to upload. Due to the
power of 2 limitations the gl height may be bigger than the real
surface height. If that is not the case, the uploading function will
pick the correct parts from the converted surface data.
2007-02-15 17:22:27 +01:00
Stefan Dösinger
20a07693b5
wined3d: Read offscreen render targets upside down when blitting them to a texture.
2007-02-15 17:22:06 +01:00
H. Verbeet
75ebf29e1b
wined3d: Get rid of any remaining d3d9 stuff in surface.c and surface_gdi.c.
2007-02-15 14:21:11 +01:00
Stefan Dösinger
1282b43302
wined3d: Restore blitting environment after modifying it.
2007-02-15 11:41:05 +01:00
Stefan Dösinger
8b8e30b1e1
ddraw, wined3d: Color keying tests and fixes.
2007-02-15 11:37:00 +01:00
Stefan Dösinger
ccd2772e28
wined3d: Accelerated blits from and to offscreen render targets.
2007-02-15 11:36:39 +01:00
Stefan Dösinger
de036ff68e
wined3d: Convert and load U8V8 surfaces as rgb.
...
GL_INDEX is definitly not the way to load U8V8 surfaces
2007-02-15 11:36:28 +01:00
Stefan Dösinger
b90a665d20
wined3d: Do not allocate compressed surfaces with glTexImage2D.
2007-02-14 12:29:42 +01:00
Stefan Dösinger
403b5ecf60
wined3d: Partial render target locking.
2007-02-14 12:29:11 +01:00
Stefan Dösinger
b48dfb3c54
wined3d: Always use np2 repacking if no native np2 support is available.
2007-02-14 12:29:01 +01:00
Stefan Dösinger
21172f1dec
wined3d: Improve render target locking.
2007-02-14 12:28:39 +01:00
Stefan Dösinger
c3f0eb489b
wined3d: Remove pow2Size from the surfaces.
2007-02-14 12:28:19 +01:00
Stefan Dösinger
12252d0589
wined3d: Use the context manager to select the primary render target.
2007-02-13 12:05:35 +01:00
Stefan Dösinger
e534340450
wined3d: Improve render target to texture blits.
2007-02-13 12:04:20 +01:00
Stefan Dösinger
f22d37e4dd
wined3d: Use the context manager to prepare for blitting.
2007-02-13 12:04:08 +01:00
Stefan Dösinger
e6c9a073b0
wined3d: Store state optmization members in the context.
2007-02-13 11:50:38 +01:00
Stefan Dösinger
c739c387b6
wined3d: Add a per context structure for context management.
2007-02-13 11:50:14 +01:00
Stefan Dösinger
67b1f4a7e9
wined3d: BeginScene and EndScene tests and fixes.
2007-02-12 12:08:34 +01:00
Stefan Dösinger
03389acc30
wined3d: Do not free regularily locked surfaces.
2007-01-15 12:43:29 +01:00
Stefan Dösinger
723b32b1c9
wined3d: Do not perform a NULL check on riid (Coverity).
2007-01-12 11:49:46 +01:00
Stefan Dösinger
d0f1c23c93
wined3d: Select a proper texture unit in LockRect and dirtify the state.
2007-01-03 11:20:06 +01:00
Stefan Dösinger
e26e3ee5f3
wined3d: Remove d3ddevice_set_ortho.
2007-01-03 11:19:55 +01:00
Stefan Dösinger
82bd0790ed
wined3d: Move the projection matrix into its own state.
2007-01-03 11:19:45 +01:00
Stefan Dösinger
5fa0f7f775
wined3d: Move the world matrix to the state table.
2007-01-03 11:19:09 +01:00
Alexandre Julliard
656fc93815
Use GetDC instead of CreateDC where possible.
2007-01-02 17:16:36 +01:00
Stefan Dösinger
603038a07a
wined3d: Do not setup states for unlocking if unlocking is disabled.
2006-12-29 12:49:41 +01:00
Stefan Dösinger
666b507766
wined3d: Move samplers to the state table.
2006-12-20 17:07:56 +01:00
H. Verbeet
8355b1a501
wined3d: Allow the device to store multiple render targets.
2006-12-20 12:31:40 +01:00
Markus Amsler
9b397ec2d5
wined3d: Remove IWineD3DSurface_GetContainerParent.
2006-12-18 12:02:17 +01:00
Vitaliy Margolen
81c7c00bb2
wined3d/d3d9: Pitch for DXTn textures can not be 0. With tests.
2006-12-04 12:38:16 +01:00
Markus Amsler
c40501db50
Revert "d3d: Remove AddRef from IWineD3DDevice_GetSwapChain.".
...
This reverts commit f84f687e6d
.
2006-11-30 16:03:59 +01:00
Markus Amsler
f84f687e6d
d3d: Remove AddRef from IWineD3DDevice_GetSwapChain.
2006-11-22 11:40:50 +01:00
Markus Amsler
fc179532f4
wined3d: Fix regression in surface conversion.
2006-11-08 11:25:27 +01:00
Francois Gouget
30e44c85c8
Assorted spelling fixes.
2006-11-07 15:25:24 +01:00
Markus Amsler
5ec0ce5b38
wined3d: Use width while converting surfaces.
...
This fixes also a heap corruption with 1x1 and 2x2 surfaces.
2006-11-07 15:06:16 +01:00
Markus Amsler
5864d18c96
wined3d: Use SURFACE_ALIGNMENT.
2006-11-07 15:06:02 +01:00
Ivan Gyurdiev
b1df1d8320
wined3d: Add D3DCLEAR codes to the WINED3D namespace.
2006-10-31 12:09:46 +01:00
Ivan Gyurdiev
5f79e80827
wined3d: Add D3DZBUFFERTYPE to the WINED3D namespace.
2006-10-24 20:06:45 +02:00
Karsten Elfenbein
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
Ivan Gyurdiev
9628a1b2e2
wined3d: Merge D3DRECT types into one type in WINED3D namespace.
2006-10-12 12:37:08 +02:00
Ivan Gyurdiev
b1a4bd87a9
wined3d: D3DRENDERSTATETYPE: Consistently use in the WINED3D namespace.
2006-10-12 12:33:24 +02:00
Ivan Gyurdiev
fb0c932f21
wined3d: D3DFORMAT: Consistently use WINED3D namespace.
2006-10-11 12:17:21 +02:00
Christopher GAUTIER
331679bcc9
wined3d: Disable GL_REGISTER_COMBINERS_NV (if supported) in IWineD3DSurfaceImpl_BltOverride.
2006-10-06 15:24:08 +02:00
Stefan Dösinger
d45c16ba98
wined3d: Define the surface alignment in the header.
2006-10-06 12:53:24 +02:00
Stefan Dösinger
90f097f835
wined3d: Honor the pitch in a few more places.
2006-10-06 12:53:24 +02:00
Stefan Dösinger
49deec6139
wined3d: No color keying on surfaces with an alpha channel.
2006-10-06 12:53:24 +02:00
Stefan Dösinger
3529560cd7
wined3d: Add WINED3DUSAGE_OVERLAY.
2006-10-06 12:53:24 +02:00
Stefan Dösinger
2bcacf22d3
wined3d: Add IWineD3DSurface::UpdateOverlay.
2006-10-06 12:53:24 +02:00
Stefan Dösinger
080e4f56cf
wined3d: Add UpdatOverlayZOrder.
2006-10-06 12:53:24 +02:00
Stefan Dösinger
f6647486cf
wined3d: Add IWineD3DSurface::GetOverlayPosition.
2006-10-06 12:53:24 +02:00
Stefan Dösinger
0f3995d21a
wined3d: Add IWineD3DSurface::SetOverlayPosition.
2006-10-06 12:53:24 +02:00
Stefan Dösinger
67436f9dbd
wined3d: Correctly name a variable.
2006-10-06 12:32:29 +02:00
Ivan Gyurdiev
3dcd3681f3
wined3d: Win64 printf fixes.
2006-10-02 14:38:04 +02:00
Francois Gouget
222c167969
Assorted spelling fixes.
2006-09-29 16:28:30 +02:00
Stefan Dösinger
9cafbd6de0
wined3d: Surface data is 32 bit aligned.
2006-09-25 18:31:26 +02:00
H. Verbeet
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
Stefan Dösinger
252a0a76d4
wined3d: Properly initialize a variable.
2006-08-28 11:37:11 +02:00
Christian Costa
f50bb771c9
wined3d: Make sure b_info structure is properly allocated and released.
2006-08-17 11:20:33 +02:00
Roderick Colenbrander
2628627e79
wined3d: Surface pitch fix.
2006-08-10 10:54:59 +02:00
Francois Gouget
ce9b4baad8
Assorted spelling fixes.
2006-08-07 13:52:55 +02:00
Roderick Colenbrander
a7c2ab3e90
wined3d: Surface pitch fix.
2006-08-04 11:59:00 +02:00
Roderick Colenbrander
c0c525d458
wined3d: Paletted texture support.
2006-08-03 18:20:37 +02:00
Chris Robinson
13557abb7f
wined3d: Fix potential NULL dereference in IWineD3DSurfaceImpl_LockRect.
2006-07-31 17:20:15 +02:00
H. Verbeet
56395ca5f3
wined3d: Use GL_LIMITS(samplers) instead of GL_LIMITS(sampler_stages) in IWineD3DSurfaceImpl_UnlockRect.
2006-07-31 10:52:55 +02:00
Jason Green
d353ab7879
wined3d: Start checking for D3DUSAGE_QUERY_* items, improve traces.
2006-07-29 11:49:51 +02:00
Roderick Colenbrander
dc743d82ff
wined3d: Optimize d3dfmt_convert_surface.
2006-07-29 11:49:03 +02:00
Roderick Colenbrander
6d16eff9a6
wined3d: Render target texturing.
2006-07-28 14:01:07 +02:00
Stefan Dösinger
0fbc1fc0df
wined3d: Avoid a false ERR.
2006-07-28 12:28:19 +02:00
Roderick Colenbrander
3127d6401a
wined3d: BltFast/BltOverride color keying.
2006-07-27 12:02:16 +02:00