Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
7c97b801
Commit
7c97b801
authored
Nov 02, 2007
by
Stefan Dösinger
Committed by
Alexandre Julliard
Nov 05, 2007
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Remove an unneeded check.
parent
e15b6096
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
21 additions
and
28 deletions
+21
-28
surface.c
dlls/wined3d/surface.c
+21
-28
No files found.
dlls/wined3d/surface.c
View file @
7c97b801
...
...
@@ -3614,41 +3614,34 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, D
d3dfmt_get_conv
(
This
,
TRUE
/* We need color keying */
,
TRUE
/* We will use textures */
,
&
format
,
&
internal
,
&
type
,
&
convert
,
&
bpp
,
This
->
srgb
);
if
(
This
->
Flags
&
SFLAG_INDRAWABLE
)
{
if
(
This
->
resource
.
format
==
WINED3DFMT_P8
||
This
->
resource
.
format
==
WINED3DFMT_A8P8
||
This
->
resource
.
format
==
WINED3DFMT_DXT1
||
This
->
resource
.
format
==
WINED3DFMT_DXT2
||
This
->
resource
.
format
==
WINED3DFMT_DXT3
||
This
->
resource
.
format
==
WINED3DFMT_DXT4
||
This
->
resource
.
format
==
WINED3DFMT_DXT5
)
FIXME
(
"Format %d not supported
\n
"
,
This
->
resource
.
format
);
else
{
GLint
prevRead
;
GLint
prevRead
;
ENTER_GL
();
glGetIntegerv
(
GL_READ_BUFFER
,
&
prevRead
);
vcheckGLcall
(
"glGetIntegerv"
);
glReadBuffer
(
This
->
resource
.
wineD3DDevice
->
offscreenBuffer
);
vcheckGLcall
(
"glReadBuffer"
);
ENTER_GL
();
glGetIntegerv
(
GL_READ_BUFFER
,
&
prevRead
);
vcheckGLcall
(
"glGetIntegerv"
);
glReadBuffer
(
This
->
resource
.
wineD3DDevice
->
offscreenBuffer
);
vcheckGLcall
(
"glReadBuffer"
);
if
(
!
(
This
->
Flags
&
SFLAG_ALLOCATED
))
{
surface_allocate_surface
(
This
,
internal
,
This
->
pow2Width
,
This
->
pow2Height
,
format
,
type
);
}
if
(
!
(
This
->
Flags
&
SFLAG_ALLOCATED
))
{
surface_allocate_surface
(
This
,
internal
,
This
->
pow2Width
,
This
->
pow2Height
,
format
,
type
);
}
clear_unused_channels
(
This
);
clear_unused_channels
(
This
);
glCopyTexSubImage2D
(
This
->
glDescription
.
target
,
This
->
glDescription
.
level
,
0
,
0
,
0
,
0
,
This
->
currentDesc
.
Width
,
This
->
currentDesc
.
Height
);
checkGLcall
(
"glCopyTexSubImage2D"
);
glCopyTexSubImage2D
(
This
->
glDescription
.
target
,
This
->
glDescription
.
level
,
0
,
0
,
0
,
0
,
This
->
currentDesc
.
Width
,
This
->
currentDesc
.
Height
);
checkGLcall
(
"glCopyTexSubImage2D"
);
glReadBuffer
(
prevRead
);
vcheckGLcall
(
"glReadBuffer"
);
glReadBuffer
(
prevRead
);
vcheckGLcall
(
"glReadBuffer"
);
LEAVE_GL
();
LEAVE_GL
();
TRACE
(
"Updated target %d
\n
"
,
This
->
glDescription
.
target
);
}
TRACE
(
"Updated target %d
\n
"
,
This
->
glDescription
.
target
);
return
WINED3D_OK
;
}
else
{
/* The only place where LoadTexture() might get called when isInDraw=1
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment