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
e8c774e4
Commit
e8c774e4
authored
Nov 29, 2013
by
Stefan Dösinger
Committed by
Alexandre Julliard
Dec 02, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Remove redundant state restoration from read_from_framebuffer.
parent
6907faf8
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
20 deletions
+1
-20
surface.c
dlls/wined3d/surface.c
+1
-20
No files found.
dlls/wined3d/surface.c
View file @
e8c774e4
...
...
@@ -3450,9 +3450,6 @@ static void read_from_framebuffer(struct wined3d_surface *surface, UINT pitch)
int
i
;
BOOL
bpp
;
BOOL
srcIsUpsideDown
;
GLint
rowLen
=
0
;
GLint
skipPix
=
0
;
GLint
skipRow
=
0
;
struct
wined3d_bo_address
data
;
surface_get_memory
(
surface
,
&
data
);
...
...
@@ -3535,21 +3532,9 @@ static void read_from_framebuffer(struct wined3d_surface *surface, UINT pitch)
ERR
(
"mem not null for pbo -- unexpected
\n
"
);
}
/* Save old pixel store pack state */
gl_info
->
gl_ops
.
gl
.
p_glGetIntegerv
(
GL_PACK_ROW_LENGTH
,
&
rowLen
);
checkGLcall
(
"glGetIntegerv"
);
gl_info
->
gl_ops
.
gl
.
p_glGetIntegerv
(
GL_PACK_SKIP_PIXELS
,
&
skipPix
);
checkGLcall
(
"glGetIntegerv"
);
gl_info
->
gl_ops
.
gl
.
p_glGetIntegerv
(
GL_PACK_SKIP_ROWS
,
&
skipRow
);
checkGLcall
(
"glGetIntegerv"
);
/* Setup pixel store pack state -- to glReadPixels into the correct place */
gl_info
->
gl_ops
.
gl
.
p_glPixelStorei
(
GL_PACK_ROW_LENGTH
,
surface
->
resource
.
width
);
checkGLcall
(
"glPixelStorei"
);
gl_info
->
gl_ops
.
gl
.
p_glPixelStorei
(
GL_PACK_SKIP_PIXELS
,
0
);
checkGLcall
(
"glPixelStorei"
);
gl_info
->
gl_ops
.
gl
.
p_glPixelStorei
(
GL_PACK_SKIP_ROWS
,
0
);
checkGLcall
(
"glPixelStorei"
);
gl_info
->
gl_ops
.
gl
.
p_glReadPixels
(
0
,
0
,
surface
->
resource
.
width
,
surface
->
resource
.
height
,
...
...
@@ -3557,11 +3542,7 @@ static void read_from_framebuffer(struct wined3d_surface *surface, UINT pitch)
checkGLcall
(
"glReadPixels"
);
/* Reset previous pixel store pack state */
gl_info
->
gl_ops
.
gl
.
p_glPixelStorei
(
GL_PACK_ROW_LENGTH
,
rowLen
);
checkGLcall
(
"glPixelStorei"
);
gl_info
->
gl_ops
.
gl
.
p_glPixelStorei
(
GL_PACK_SKIP_PIXELS
,
skipPix
);
checkGLcall
(
"glPixelStorei"
);
gl_info
->
gl_ops
.
gl
.
p_glPixelStorei
(
GL_PACK_SKIP_ROWS
,
skipRow
);
gl_info
->
gl_ops
.
gl
.
p_glPixelStorei
(
GL_PACK_ROW_LENGTH
,
0
);
checkGLcall
(
"glPixelStorei"
);
if
(
data
.
buffer_object
&&
!
srcIsUpsideDown
)
...
...
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