summaryrefslogtreecommitdiffstats
path: root/src/mesa/state_tracker
diff options
context:
space:
mode:
authorMarek Olšák <[email protected]>2020-02-14 16:53:42 -0500
committerMarek Olšák <[email protected]>2020-02-18 16:45:34 -0500
commit2491a2ddeb53f3d44b4633f967bfa5b023946bce (patch)
tree9b8d2bd6b5d7d349a033e99f802793f870eb1276 /src/mesa/state_tracker
parent06dc280a57a60e39e21c0c14ace6ada3a4574ea7 (diff)
st/mesa: try to fix MSVC build failure due to ALWAYS_INLINE
Fixes: 11db8e0e00a72884ba9f ("st/mesa: optimize st_update_array with ALWAYSINLINE") Tested-by: Eric Engestrom <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3861>
Diffstat (limited to 'src/mesa/state_tracker')
-rw-r--r--src/mesa/state_tracker/st_atom_array.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/mesa/state_tracker/st_atom_array.c b/src/mesa/state_tracker/st_atom_array.c
index de03abea66d..b4af4c3e629 100644
--- a/src/mesa/state_tracker/st_atom_array.c
+++ b/src/mesa/state_tracker/st_atom_array.c
@@ -125,7 +125,10 @@ init_velement(const struct st_vertex_program *vp,
/* ALWAYS_INLINE helps the compiler realize that most of the parameters are
* on the stack.
*/
-void ALWAYS_INLINE
+void
+#ifndef _MSC_VER /* MSVC doesn't like inlining public functions */
+ALWAYS_INLINE
+#endif
st_setup_arrays(struct st_context *st,
const struct st_vertex_program *vp,
const struct st_common_variant *vp_variant,