diff options
| author | marha <marha@users.sourceforge.net> | 2015-04-20 22:42:55 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2015-04-20 22:42:55 +0200 |
| commit | 934184bfecd402aae891b8740d788b486aa7269f (patch) | |
| tree | c23fb0afd169dc6846ea23bda21260fcffd1e3e6 /mesalib/src/glsl/nir/nir_types.h | |
| parent | 57dd848fb6dd7cf15820172e2abc9fb9de2b4268 (diff) | |
| parent | 4ba9be2882d9f1567809edb0a31fcdf11320d41f (diff) | |
| download | vcxsrv-934184bfecd402aae891b8740d788b486aa7269f.tar.gz vcxsrv-934184bfecd402aae891b8740d788b486aa7269f.tar.bz2 vcxsrv-934184bfecd402aae891b8740d788b486aa7269f.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mesa/main/.gitignore
mesalib/src/mesa/main/dlopen.h
xorg-server/hw/xwin/glx/gen_gl_wrappers.py
xorg-server/hw/xwin/win.h
xorg-server/hw/xwin/winengine.c
xorg-server/hw/xwin/winglobals.c
xorg-server/hw/xwin/winscrinit.c
xorg-server/hw/xwin/winshaddd.c
xorg-server/randr/rrxinerama.c
Diffstat (limited to 'mesalib/src/glsl/nir/nir_types.h')
| -rw-r--r-- | mesalib/src/glsl/nir/nir_types.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mesalib/src/glsl/nir/nir_types.h b/mesalib/src/glsl/nir/nir_types.h index 494051a67..276d4ad62 100644 --- a/mesalib/src/glsl/nir/nir_types.h +++ b/mesalib/src/glsl/nir/nir_types.h @@ -69,6 +69,7 @@ bool glsl_type_is_scalar(const struct glsl_type *type); bool glsl_type_is_matrix(const struct glsl_type *type); const struct glsl_type *glsl_void_type(void); +const struct glsl_type *glsl_float_type(void); const struct glsl_type *glsl_vec4_type(void); const struct glsl_type *glsl_array_type(const struct glsl_type *base, unsigned elements); |