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
8dc789fe
Commit
8dc789fe
authored
Apr 19, 2018
by
Henri Verbeet
Committed by
Alexandre Julliard
Apr 19, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Handle "namedArraysLoaded" in context_unload_vertex_data().
Signed-off-by:
Henri Verbeet
<
hverbeet@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
437861f1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
5 deletions
+6
-5
context.c
dlls/wined3d/context.c
+6
-5
No files found.
dlls/wined3d/context.c
View file @
8dc789fe
...
...
@@ -5058,18 +5058,20 @@ void context_load_tex_coords(const struct wined3d_context *context, const struct
checkGLcall
(
"loadTexCoords"
);
}
/* This should match any arrays loaded in context_load_vertex_data().
* TODO: Only load/unload arrays if we have to. */
static
void
context_unload_vertex_data
(
const
struct
wined3d_context
*
context
)
/* This should match any arrays loaded in context_load_vertex_data(). */
static
void
context_unload_vertex_data
(
struct
wined3d_context
*
context
)
{
const
struct
wined3d_gl_info
*
gl_info
=
context
->
gl_info
;
if
(
!
context
->
namedArraysLoaded
)
return
;
gl_info
->
gl_ops
.
gl
.
p_glDisableClientState
(
GL_VERTEX_ARRAY
);
gl_info
->
gl_ops
.
gl
.
p_glDisableClientState
(
GL_NORMAL_ARRAY
);
gl_info
->
gl_ops
.
gl
.
p_glDisableClientState
(
GL_COLOR_ARRAY
);
if
(
gl_info
->
supported
[
EXT_SECONDARY_COLOR
])
gl_info
->
gl_ops
.
gl
.
p_glDisableClientState
(
GL_SECONDARY_COLOR_ARRAY_EXT
);
context_unload_tex_coords
(
context
);
context
->
namedArraysLoaded
=
FALSE
;
}
static
void
context_load_vertex_data
(
struct
wined3d_context
*
context
,
...
...
@@ -5489,10 +5491,9 @@ void context_update_stream_sources(struct wined3d_context *context, const struct
context_unload_numbered_arrays
(
context
);
context
->
numbered_array_mask
=
0
;
}
else
if
(
context
->
namedArraysLoaded
)
else
{
context_unload_vertex_data
(
context
);
context
->
namedArraysLoaded
=
FALSE
;
}
if
(
load_numbered
)
...
...
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