iris: Make iris_bo_import_dmabuf take a modifier

[mesa.git] / src / gallium / drivers / swr / swr_shader.cpp

diff --git a/src/gallium/drivers/swr/swr_shader.cpp b/src/gallium/drivers/swr/swr_shader.cpp
index 90333536421f0e7de68836a6014be1ad573081b5..cc3bf717653fd6c09a1eb109818123e45c34b6dc 100644 (file)
--- a/src/gallium/drivers/swr/swr_shader.cpp
+++ b/src/gallium/drivers/swr/swr_shader.cpp
@@ -189,7 +189,7 @@ swr_generate_fs_key(struct swr_jit_fs_key &key,
                     struct swr_context *ctx,
                     swr_fragment_shader *swr_fs)
 {
-   memset(&key, 0, sizeof(key));
+   memset((void*)&key, 0, sizeof(key));
 
    key.nr_cbufs = ctx->framebuffer.nr_cbufs;
    key.light_twoside = ctx->rasterizer->light_twoside;
@@ -221,7 +221,7 @@ swr_generate_vs_key(struct swr_jit_vs_key &key,
                     struct swr_context *ctx,
                     swr_vertex_shader *swr_vs)
 {
-   memset(&key, 0, sizeof(key));
+   memset((void*)&key, 0, sizeof(key));
 
    key.clip_plane_mask =
       swr_vs->info.base.clipdist_writemask ?
@@ -235,7 +235,7 @@ void
 swr_generate_fetch_key(struct swr_jit_fetch_key &key,
                        struct swr_vertex_element_state *velems)
 {
-   memset(&key, 0, sizeof(key));
+   memset((void*)&key, 0, sizeof(key));
 
    key.fsState = velems->fsState;
 }
@@ -245,7 +245,7 @@ swr_generate_gs_key(struct swr_jit_gs_key &key,
                     struct swr_context *ctx,
                     swr_geometry_shader *swr_gs)
 {
-   memset(&key, 0, sizeof(key));
+   memset((void*)&key, 0, sizeof(key));
 
    struct tgsi_shader_info *pPrevShader = nullptr;
 
@@ -270,7 +270,7 @@ swr_generate_tcs_key(struct swr_jit_tcs_key &key,
                     struct swr_context *ctx,
                     swr_tess_control_shader *swr_tcs)
 {
-   memset(&key, 0, sizeof(key));
+   memset((void*)&key, 0, sizeof(key));
 
    struct tgsi_shader_info *pPrevShader = &ctx->vs->info.base;
 
@@ -294,7 +294,7 @@ swr_generate_tes_key(struct swr_jit_tes_key &key,
                     struct swr_context *ctx,
                     swr_tess_evaluation_shader *swr_tes)
 {
-   memset(&key, 0, sizeof(key));
+   memset((void*)&key, 0, sizeof(key));
 
    struct tgsi_shader_info *pPrevShader = nullptr;
 
@@ -327,7 +327,7 @@ struct BuilderSWR : public Builder {
       : Builder(pJitMgr)
    {
       pJitMgr->SetupNewModule();
-      gallivm = gallivm_create(pName, wrap(&JM()->mContext));
+      gallivm = gallivm_create(pName, wrap(&JM()->mContext), NULL);
       pJitMgr->mpCurrentModule = unwrap(gallivm->module);
    }
 
@@ -504,6 +504,7 @@ swr_gs_llvm_emit_vertex(const struct lp_build_gs_iface *gs_base,
                            struct lp_build_context * bld,
                            LLVMValueRef (*outputs)[4],
                            LLVMValueRef emitted_vertices_vec,
+                           LLVMValueRef mask_vec,
                            LLVMValueRef stream_id)
 {
     swr_gs_llvm_iface *iface = (swr_gs_llvm_iface*)gs_base;
@@ -520,7 +521,7 @@ swr_gs_llvm_end_primitive(const struct lp_build_gs_iface *gs_base,
                              LLVMValueRef total_emitted_vertices_vec_ptr,
                              LLVMValueRef verts_per_prim_vec,
                              LLVMValueRef emitted_prims_vec,
-                             LLVMValueRef mask_vec)
+                             LLVMValueRef mask_vec, unsigned stream_id)
 {
     swr_gs_llvm_iface *iface = (swr_gs_llvm_iface*)gs_base;