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
f585a301
Commit
f585a301
authored
Jun 19, 2019
by
Henri Verbeet
Committed by
Alexandre Julliard
Jun 19, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Pass a wined3d_context_gl structure to context_load_vertex_data().
Signed-off-by:
Henri Verbeet
<
hverbeet@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
26203c8a
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
7 deletions
+6
-7
context.c
dlls/wined3d/context.c
+6
-7
No files found.
dlls/wined3d/context.c
View file @
f585a301
...
@@ -5092,7 +5092,7 @@ void wined3d_context_gl_load_tex_coords(const struct wined3d_context_gl *context
...
@@ -5092,7 +5092,7 @@ void wined3d_context_gl_load_tex_coords(const struct wined3d_context_gl *context
checkGLcall
(
"loadTexCoords"
);
checkGLcall
(
"loadTexCoords"
);
}
}
/* This should match any arrays loaded in
context
_load_vertex_data(). */
/* This should match any arrays loaded in
wined3d_context_gl
_load_vertex_data(). */
static
void
wined3d_context_gl_unload_vertex_data
(
struct
wined3d_context_gl
*
context_gl
)
static
void
wined3d_context_gl_unload_vertex_data
(
struct
wined3d_context_gl
*
context_gl
)
{
{
const
struct
wined3d_gl_info
*
gl_info
=
context_gl
->
c
.
gl_info
;
const
struct
wined3d_gl_info
*
gl_info
=
context_gl
->
c
.
gl_info
;
...
@@ -5108,20 +5108,19 @@ static void wined3d_context_gl_unload_vertex_data(struct wined3d_context_gl *con
...
@@ -5108,20 +5108,19 @@ static void wined3d_context_gl_unload_vertex_data(struct wined3d_context_gl *con
context_gl
->
c
.
namedArraysLoaded
=
FALSE
;
context_gl
->
c
.
namedArraysLoaded
=
FALSE
;
}
}
static
void
context_load_vertex_data
(
struct
wined3d_context
*
context
,
static
void
wined3d_context_gl_load_vertex_data
(
struct
wined3d_context_gl
*
context_gl
,
const
struct
wined3d_stream_info
*
si
,
const
struct
wined3d_state
*
state
)
const
struct
wined3d_stream_info
*
si
,
const
struct
wined3d_state
*
state
)
{
{
struct
wined3d_context_gl
*
context_gl
=
wined3d_context_gl
(
context
);
const
struct
wined3d_gl_info
*
gl_info
=
context_gl
->
c
.
gl_info
;
const
struct
wined3d_gl_info
*
gl_info
=
context
->
gl_info
;
const
struct
wined3d_stream_info_element
*
e
;
const
struct
wined3d_stream_info_element
*
e
;
const
struct
wined3d_format_gl
*
format_gl
;
const
struct
wined3d_format_gl
*
format_gl
;
GLuint
current_bo
;
GLuint
current_bo
;
TRACE
(
"context
%p, si %p, state %p.
\n
"
,
context
,
si
,
state
);
TRACE
(
"context
_gl %p, si %p, state %p.
\n
"
,
context_gl
,
si
,
state
);
/* This is used for the fixed-function pipeline only, and the
/* This is used for the fixed-function pipeline only, and the
* fixed-function pipeline doesn't do instancing. */
* fixed-function pipeline doesn't do instancing. */
context
->
instance_count
=
0
;
context
_gl
->
c
.
instance_count
=
0
;
current_bo
=
gl_info
->
supported
[
ARB_VERTEX_BUFFER_OBJECT
]
?
~
0u
:
0
;
current_bo
=
gl_info
->
supported
[
ARB_VERTEX_BUFFER_OBJECT
]
?
~
0u
:
0
;
/* Blend data */
/* Blend data */
...
@@ -5556,7 +5555,7 @@ void wined3d_context_gl_update_stream_sources(struct wined3d_context_gl *context
...
@@ -5556,7 +5555,7 @@ void wined3d_context_gl_update_stream_sources(struct wined3d_context_gl *context
TRACE
(
"Loading named arrays.
\n
"
);
TRACE
(
"Loading named arrays.
\n
"
);
context_unload_numbered_arrays
(
&
context_gl
->
c
);
context_unload_numbered_arrays
(
&
context_gl
->
c
);
context_load_vertex_data
(
&
context_gl
->
c
,
&
context_gl
->
c
.
stream_info
,
state
);
wined3d_context_gl_load_vertex_data
(
context_gl
,
&
context_gl
->
c
.
stream_info
,
state
);
context_gl
->
c
.
namedArraysLoaded
=
TRUE
;
context_gl
->
c
.
namedArraysLoaded
=
TRUE
;
}
}
...
...
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