diff --git a/src/gallium/auxiliary/gallivm/lp_bld_init.h b/src/gallium/auxiliary/gallivm/lp_bld_init.h
index 0a5c85d4314..418921cb7ad 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_init.h
+++ b/src/gallium/auxiliary/gallivm/lp_bld_init.h
@@ -66,6 +66,9 @@ struct gallivm_state
    LLVMTypeRef coro_free_hook_type;
 
    LLVMValueRef get_time_hook;
+
+   LLVMValueRef texture_descriptor;
+   LLVMValueRef sampler_descriptor;
 };
 
 unsigned
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_sample.h b/src/gallium/auxiliary/gallivm/lp_bld_sample.h
index d031a978744..344051f8a3b 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_sample.h
+++ b/src/gallium/auxiliary/gallivm/lp_bld_sample.h
@@ -117,6 +117,10 @@ struct lp_sampler_params
    LLVMValueRef aniso_filter_table;
    const struct lp_derivatives *derivs;
    LLVMValueRef *texel;
+
+   LLVMValueRef texture_resource;
+   LLVMValueRef sampler_resource;
+   LLVMValueRef exec_mask;
 };
 
 /* Parameters used to handle sampler_size instructions */
@@ -133,6 +137,10 @@ struct lp_sampler_size_query_params
    enum lp_sampler_lod_property lod_property;
    LLVMValueRef explicit_lod;
    LLVMValueRef *sizes_out;
+
+   LLVMValueRef resource;
+   LLVMValueRef exec_mask;
+   enum pipe_format format;
 };
 
 #define LP_IMG_LOAD 0
@@ -159,6 +167,9 @@ struct lp_img_params
    LLVMValueRef indata[4];
    LLVMValueRef indata2[4];
    LLVMValueRef *outdata;
+
+   LLVMValueRef resource;
+   enum pipe_format format;
 };