diff options
| author | Marek Olšák <[email protected]> | 2011-09-27 22:22:06 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2011-09-30 23:19:52 +0200 |
| commit | f5bfe54a34d9c8cd5de2b096d0e8486fe0d990a7 (patch) | |
| tree | 5c61a58b22bd018661f8b4f12e5974bf07b18c20 /src/gallium/include/pipe | |
| parent | 557c3febdfd88ba1a41d3e8e0221e447d491c343 (diff) | |
gallium: add and use PIPE_SHADER_CAP_MAX_TEXTURE_SAMPLERS
This removes:
- PIPE_CAP_MAX_TEXTURE_IMAGE_UNITS
- PIPE_CAP_MAX_VERTEX_TEXTURE_UNITS
in favor of the that new per-shader cap.
Reviewed-by: Brian Paul <[email protected]>
Diffstat (limited to 'src/gallium/include/pipe')
| -rw-r--r-- | src/gallium/include/pipe/p_defines.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/gallium/include/pipe/p_defines.h b/src/gallium/include/pipe/p_defines.h index e562e491284..950672c9171 100644 --- a/src/gallium/include/pipe/p_defines.h +++ b/src/gallium/include/pipe/p_defines.h @@ -418,7 +418,6 @@ enum pipe_transfer_usage { * pipe_screen::get_param() and pipe_screen::get_paramf(). */ enum pipe_cap { - PIPE_CAP_MAX_TEXTURE_IMAGE_UNITS = 0, PIPE_CAP_NPOT_TEXTURES = 1, PIPE_CAP_TWO_SIDED_STENCIL = 2, PIPE_CAP_GLSL = 3, /* XXX need something better */ @@ -444,7 +443,6 @@ enum pipe_cap { PIPE_CAP_GUARD_BAND_RIGHT = 23, /*< float */ PIPE_CAP_GUARD_BAND_BOTTOM = 24, /*< float */ PIPE_CAP_TEXTURE_MIRROR_CLAMP = 25, - PIPE_CAP_MAX_VERTEX_TEXTURE_UNITS = 27, PIPE_CAP_BLEND_EQUATION_SEPARATE = 28, PIPE_CAP_SM3 = 29, /*< Shader Model, supported */ PIPE_CAP_STREAM_OUTPUT = 30, @@ -496,7 +494,8 @@ enum pipe_shader_cap PIPE_SHADER_CAP_INDIRECT_TEMP_ADDR = 14, PIPE_SHADER_CAP_INDIRECT_CONST_ADDR = 15, PIPE_SHADER_CAP_SUBROUTINES = 16, /* BGNSUB, ENDSUB, CAL, RET */ - PIPE_SHADER_CAP_INTEGERS = 17 + PIPE_SHADER_CAP_INTEGERS = 17, + PIPE_SHADER_CAP_MAX_TEXTURE_SAMPLERS = 18 }; |