projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '7.8'
[mesa.git]
/
src
/
gallium
/
auxiliary
/
gallivm
/
lp_bld_sample.h
diff --git
a/src/gallium/auxiliary/gallivm/lp_bld_sample.h
b/src/gallium/auxiliary/gallivm/lp_bld_sample.h
index 7f08bfaac1f8de6d7b5de62bb411027744a3f384..8ceb20473d57099988f9c1c86b94fba4dbb8f1c8 100644
(file)
--- a/
src/gallium/auxiliary/gallivm/lp_bld_sample.h
+++ b/
src/gallium/auxiliary/gallivm/lp_bld_sample.h
@@
-36,9
+36,10
@@
#define LP_BLD_SAMPLE_H
#define LP_BLD_SAMPLE_H
-#include "
os/os_llvm
.h"
+#include "
gallivm/lp_bld
.h"
-struct pipe_texture;
+struct pipe_resource;
+struct pipe_sampler_view;
struct pipe_sampler_state;
struct util_format_description;
struct lp_type;
struct pipe_sampler_state;
struct util_format_description;
struct lp_type;
@@
-48,14
+49,20
@@
struct lp_build_context;
/**
* Sampler static state.
*
/**
* Sampler static state.
*
- * These are the bits of state from pipe_
textur
e and pipe_sampler_state that
+ * These are the bits of state from pipe_
resourc
e and pipe_sampler_state that
* are embedded in the generated code.
*/
struct lp_sampler_static_state
{
* are embedded in the generated code.
*/
struct lp_sampler_static_state
{
- /* pipe_
texture
's state */
+ /* pipe_
sampler_view
's state */
enum pipe_format format;
enum pipe_format format;
- unsigned target:2;
+ unsigned swizzle_r:3;
+ unsigned swizzle_g:3;
+ unsigned swizzle_b:3;
+ unsigned swizzle_a:3;
+
+ /* pipe_texture's state */
+ unsigned target:3;
unsigned pot_width:1;
unsigned pot_height:1;
unsigned pot_depth:1;
unsigned pot_width:1;
unsigned pot_height:1;
unsigned pot_depth:1;
@@
-78,7
+85,7
@@
struct lp_sampler_static_state
/**
* Sampler dynamic state.
*
/**
* Sampler dynamic state.
*
- * These are the bits of state from pipe_
textur
e and pipe_sampler_state that
+ * These are the bits of state from pipe_
resourc
e and pipe_sampler_state that
* are computed in runtime.
*
* There are obtained through callbacks, as we don't want to tie the texture
* are computed in runtime.
*
* There are obtained through callbacks, as we don't want to tie the texture
@@
-117,6
+124,11
@@
struct lp_sampler_dynamic_state
LLVMBuilderRef builder,
unsigned unit);
LLVMBuilderRef builder,
unsigned unit);
+ LLVMValueRef
+ (*img_stride)( struct lp_sampler_dynamic_state *state,
+ LLVMBuilderRef builder,
+ unsigned unit);
+
LLVMValueRef
(*data_ptr)( struct lp_sampler_dynamic_state *state,
LLVMBuilderRef builder,
LLVMValueRef
(*data_ptr)( struct lp_sampler_dynamic_state *state,
LLVMBuilderRef builder,
@@
-130,7
+142,7
@@
struct lp_sampler_dynamic_state
*/
void
lp_sampler_static_state(struct lp_sampler_static_state *state,
*/
void
lp_sampler_static_state(struct lp_sampler_static_state *state,
- const struct pipe_
texture *texture
,
+ const struct pipe_
sampler_view *view
,
const struct pipe_sampler_state *sampler);
const struct pipe_sampler_state *sampler);