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
a7315eb7
Commit
a7315eb7
authored
Jul 10, 2015
by
Matteo Bruni
Committed by
Alexandre Julliard
Jul 13, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Bind a VAO when using core profile contexts.
parent
3c49a012
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
0 deletions
+21
-0
context.c
dlls/wined3d/context.c
+9
-0
directx.c
dlls/wined3d/directx.c
+12
-0
No files found.
dlls/wined3d/context.c
View file @
a7315eb7
...
...
@@ -1735,6 +1735,15 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain,
gl_info
->
gl_ops
.
gl
.
p_glPixelStorei
(
GL_UNPACK_ALIGNMENT
,
1
);
checkGLcall
(
"glPixelStorei(GL_UNPACK_ALIGNMENT, device->surface_alignment);"
);
if
(
!
gl_info
->
supported
[
WINED3D_GL_LEGACY_CONTEXT
])
{
GLuint
vao
;
GL_EXTCALL
(
glGenVertexArrays
(
1
,
&
vao
));
GL_EXTCALL
(
glBindVertexArray
(
vao
));
checkGLcall
(
"creating VAO"
);
}
if
(
gl_info
->
supported
[
ARB_VERTEX_BLEND
])
{
/* Direct3D always uses n-1 weights for n world matrices and uses
...
...
dlls/wined3d/directx.c
View file @
a7315eb7
...
...
@@ -2898,6 +2898,7 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info)
USE_GL_FUNC
(
glBeginQuery
)
/* OpenGL 1.5 */
USE_GL_FUNC
(
glBindAttribLocation
)
/* OpenGL 2.0 */
USE_GL_FUNC
(
glBindBuffer
)
/* OpenGL 1.5 */
USE_GL_FUNC
(
glBindVertexArray
)
/* OpenGL 3.0 */
USE_GL_FUNC
(
glBlendColor
)
/* OpenGL 1.4 */
USE_GL_FUNC
(
glBlendEquation
)
/* OpenGL 1.4 */
USE_GL_FUNC
(
glBlendEquationSeparate
)
/* OpenGL 2.0 */
...
...
@@ -2916,6 +2917,7 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info)
USE_GL_FUNC
(
glDeleteProgram
)
/* OpenGL 2.0 */
USE_GL_FUNC
(
glDeleteQueries
)
/* OpenGL 1.5 */
USE_GL_FUNC
(
glDeleteShader
)
/* OpenGL 2.0 */
USE_GL_FUNC
(
glDeleteVertexArrays
)
/* OpenGL 3.0 */
USE_GL_FUNC
(
glDetachShader
)
/* OpenGL 2.0 */
USE_GL_FUNC
(
glDisableVertexAttribArray
)
/* OpenGL 2.0 */
USE_GL_FUNC
(
glDrawArraysInstanced
)
/* OpenGL 3.1 */
...
...
@@ -2925,6 +2927,7 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info)
USE_GL_FUNC
(
glEndQuery
)
/* OpenGL 1.5 */
USE_GL_FUNC
(
glGenBuffers
)
/* OpenGL 1.5 */
USE_GL_FUNC
(
glGenQueries
)
/* OpenGL 1.5 */
USE_GL_FUNC
(
glGenVertexArrays
)
/* OpenGL 3.0 */
USE_GL_FUNC
(
glGetActiveUniform
)
/* OpenGL 2.0 */
USE_GL_FUNC
(
glGetAttachedShaders
)
/* OpenGL 2.0 */
USE_GL_FUNC
(
glGetAttribLocation
)
/* OpenGL 2.0 */
...
...
@@ -3788,6 +3791,15 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter)
for
(
i
=
0
;
i
<
gl_info
->
limits
.
buffers
;
++
i
)
adapter
->
d3d_info
.
valid_rt_mask
|=
(
1
<<
i
);
if
(
!
gl_info
->
supported
[
WINED3D_GL_LEGACY_CONTEXT
])
{
GLuint
vao
;
GL_EXTCALL
(
glGenVertexArrays
(
1
,
&
vao
));
GL_EXTCALL
(
glBindVertexArray
(
vao
));
checkGLcall
(
"creating VAO"
);
}
fixup_extensions
(
gl_info
,
gl_renderer_str
,
gl_vendor
,
card_vendor
,
device
);
init_driver_info
(
driver_info
,
card_vendor
,
device
);
add_gl_compat_wrappers
(
gl_info
);
...
...
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