Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
aff0c389
Commit
aff0c389
authored
Jan 20, 2015
by
Matteo Bruni
Committed by
Alexandre Julliard
Jan 20, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Use the core version of glDrawElementsInstanced.
parent
75b96768
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
directx.c
dlls/wined3d/directx.c
+2
-0
drawprim.c
dlls/wined3d/drawprim.c
+2
-2
No files found.
dlls/wined3d/directx.c
View file @
aff0c389
...
...
@@ -2884,6 +2884,7 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info)
USE_GL_FUNC
(
glCompressedTexSubImage3D
)
/* OpenGL 1.3 */
USE_GL_FUNC
(
glDeleteBuffers
)
/* OpenGL 1.5 */
USE_GL_FUNC
(
glDrawBuffers
)
/* OpenGL 2.0 */
USE_GL_FUNC
(
glDrawElementsInstanced
)
/* OpenGL 3.1 */
USE_GL_FUNC
(
glGenBuffers
)
/* OpenGL 1.5 */
USE_GL_FUNC
(
glGetBufferSubData
)
/* OpenGL 1.5 */
USE_GL_FUNC
(
glGetCompressedTexImage
)
/* OpenGL 1.3 */
...
...
@@ -2919,6 +2920,7 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info)
MAP_GL_FUNCTION
(
glCompressedTexSubImage3D
,
glCompressedTexSubImage3DARB
);
MAP_GL_FUNCTION
(
glDeleteBuffers
,
glDeleteBuffersARB
);
MAP_GL_FUNCTION
(
glDrawBuffers
,
glDrawBuffersARB
);
MAP_GL_FUNCTION
(
glDrawElementsInstanced
,
glDrawElementsInstancedARB
);
MAP_GL_FUNCTION
(
glGenBuffers
,
glGenBuffersARB
);
MAP_GL_FUNCTION
(
glGetBufferSubData
,
glGetBufferSubDataARB
);
MAP_GL_FUNCTION
(
glGetCompressedTexImage
,
glGetCompressedTexImageARB
);
...
...
dlls/wined3d/drawprim.c
View file @
aff0c389
...
...
@@ -60,9 +60,9 @@ static void drawStridedFast(const struct wined3d_gl_info *gl_info, GLenum primit
}
else
{
GL_EXTCALL
(
glDrawElementsInstanced
ARB
(
primitive_type
,
count
,
idxtype
,
GL_EXTCALL
(
glDrawElementsInstanced
(
primitive_type
,
count
,
idxtype
,
(
const
char
*
)
idx_data
+
(
idx_size
*
start_idx
),
instance_count
));
checkGLcall
(
"glDrawElementsInstanced
ARB
"
);
checkGLcall
(
"glDrawElementsInstanced"
);
}
}
}
...
...
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