diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2023-11-02 04:53:47 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2023-11-02 04:53:47 +0000 |
| commit | b44518130b33cadb5c1d619e9e936ae0e0dbf7cb (patch) | |
| tree | 6069eb03c39fbc79808a7d94f857118cce75cbe3 /lib/mesa/src/gallium/drivers/nouveau/nv30 | |
| parent | 32aeb3c41fedbbd7b11aacfec48e8f699d16bff0 (diff) | |
Merge Mesa 23.1.9
Diffstat (limited to 'lib/mesa/src/gallium/drivers/nouveau/nv30')
| -rw-r--r-- | lib/mesa/src/gallium/drivers/nouveau/nv30/nv30_context.h | 2 | ||||
| -rw-r--r-- | lib/mesa/src/gallium/drivers/nouveau/nv30/nv30_screen.c | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/lib/mesa/src/gallium/drivers/nouveau/nv30/nv30_context.h b/lib/mesa/src/gallium/drivers/nouveau/nv30/nv30_context.h index 7ea5c5b87..1f5b47678 100644 --- a/lib/mesa/src/gallium/drivers/nouveau/nv30/nv30_context.h +++ b/lib/mesa/src/gallium/drivers/nouveau/nv30/nv30_context.h @@ -1,7 +1,7 @@ #ifndef __NV30_CONTEXT_H__ #define __NV30_CONTEXT_H__ -#include "pipe/p_format.h" +#include "util/format/u_formats.h" #include "util/u_blitter.h" #include "nv30/nv30_screen.h" diff --git a/lib/mesa/src/gallium/drivers/nouveau/nv30/nv30_screen.c b/lib/mesa/src/gallium/drivers/nouveau/nv30/nv30_screen.c index 09b707dc2..f8d108845 100644 --- a/lib/mesa/src/gallium/drivers/nouveau/nv30/nv30_screen.c +++ b/lib/mesa/src/gallium/drivers/nouveau/nv30/nv30_screen.c @@ -364,8 +364,6 @@ nv30_screen_get_shader_param(struct pipe_screen *pscreen, case PIPE_SHADER_CAP_INT16: case PIPE_SHADER_CAP_GLSL_16BIT_CONSTS: case PIPE_SHADER_CAP_DROUND_SUPPORTED: - case PIPE_SHADER_CAP_DFRACEXP_DLDEXP_SUPPORTED: - case PIPE_SHADER_CAP_LDEXP_SUPPORTED: case PIPE_SHADER_CAP_TGSI_ANY_INOUT_DECL_RANGE: case PIPE_SHADER_CAP_MAX_SHADER_BUFFERS: case PIPE_SHADER_CAP_MAX_SHADER_IMAGES: @@ -417,8 +415,6 @@ nv30_screen_get_shader_param(struct pipe_screen *pscreen, case PIPE_SHADER_CAP_INT16: case PIPE_SHADER_CAP_GLSL_16BIT_CONSTS: case PIPE_SHADER_CAP_DROUND_SUPPORTED: - case PIPE_SHADER_CAP_DFRACEXP_DLDEXP_SUPPORTED: - case PIPE_SHADER_CAP_LDEXP_SUPPORTED: case PIPE_SHADER_CAP_TGSI_ANY_INOUT_DECL_RANGE: case PIPE_SHADER_CAP_MAX_SHADER_BUFFERS: case PIPE_SHADER_CAP_MAX_SHADER_IMAGES: |