OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gallium: rename PIPE_CAPF_MAX_POINT_WIDTH -> MAX_POINT_SIZE

Browse Source 
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13676>
This commit is contained in:
Marek Olšák
2021-11-04 08:26:31 -04:00
committed by Marge Bot
parent 10ee261c38
commit b80dca86c3
29 changed files with 55 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/gallium/screen.rst
View File

@@ -639,8 +639,8 @@ The floating-point capabilities are:
* ``PIPE_CAPF_MAX_LINE_WIDTH``: The maximum width of a regular line. * ``PIPE_CAPF_MAX_LINE_WIDTH``: The maximum width of a regular line.
* ``PIPE_CAPF_MAX_LINE_WIDTH_AA``: The maximum width of a smoothed line. * ``PIPE_CAPF_MAX_LINE_WIDTH_AA``: The maximum width of a smoothed line.
* ``PIPE_CAPF_MAX_POINT_WIDTH``: The maximum width and height of a point. * ``PIPE_CAPF_MAX_POINT_SIZE``: The maximum width and height of a point.
* ``PIPE_CAPF_MAX_POINT_WIDTH_AA``: The maximum width and height of a smoothed point. * ``PIPE_CAPF_MAX_POINT_SIZE_AA``: The maximum width and height of a smoothed point.
* ``PIPE_CAPF_MAX_TEXTURE_ANISOTROPY``: The maximum level of anisotropy that can be * ``PIPE_CAPF_MAX_TEXTURE_ANISOTROPY``: The maximum level of anisotropy that can be
applied to anisotropically filtered textures. applied to anisotropically filtered textures.
* ``PIPE_CAPF_MAX_TEXTURE_LOD_BIAS``: The maximum :term:`LOD` bias that may be applied * ``PIPE_CAPF_MAX_TEXTURE_LOD_BIAS``: The maximum :term:`LOD` bias that may be applied

4
src/gallium/drivers/asahi/agx_pipe.c
View File

@@ -866,8 +866,8 @@ agx_get_paramf(struct pipe_screen* pscreen,
case PIPE_CAPF_MAX_LINE_WIDTH_AA: case PIPE_CAPF_MAX_LINE_WIDTH_AA:
return 16.0; /* Off-by-one fixed point 4:4 encoding */ return 16.0; /* Off-by-one fixed point 4:4 encoding */
case PIPE_CAPF_MAX_POINT_WIDTH: case PIPE_CAPF_MAX_POINT_SIZE:
case PIPE_CAPF_MAX_POINT_WIDTH_AA: case PIPE_CAPF_MAX_POINT_SIZE_AA:
return 511.95f; return 511.95f;
case PIPE_CAPF_MAX_TEXTURE_ANISOTROPY: case PIPE_CAPF_MAX_TEXTURE_ANISOTROPY:

4
src/gallium/drivers/crocus/crocus_screen.c
View File

@@ -418,8 +418,8 @@ crocus_get_paramf(struct pipe_screen *pscreen, enum pipe_capf param)
else else
return 7.0f; return 7.0f;
case PIPE_CAPF_MAX_POINT_WIDTH: case PIPE_CAPF_MAX_POINT_SIZE:
case PIPE_CAPF_MAX_POINT_WIDTH_AA: case PIPE_CAPF_MAX_POINT_SIZE_AA:
return 255.0f; return 255.0f;
case PIPE_CAPF_MAX_TEXTURE_ANISOTROPY: case PIPE_CAPF_MAX_TEXTURE_ANISOTROPY:

4
src/gallium/drivers/d3d12/d3d12_screen.cpp
View File

@@ -335,8 +335,8 @@ d3d12_get_paramf(struct pipe_screen *pscreen, enum pipe_capf param)
case PIPE_CAPF_MAX_LINE_WIDTH_AA: case PIPE_CAPF_MAX_LINE_WIDTH_AA:
return 1.0f; /* no clue */ return 1.0f; /* no clue */
case PIPE_CAPF_MAX_POINT_WIDTH: case PIPE_CAPF_MAX_POINT_SIZE:
case PIPE_CAPF_MAX_POINT_WIDTH_AA: case PIPE_CAPF_MAX_POINT_SIZE_AA:
return D3D12_MAX_POINT_SIZE; return D3D12_MAX_POINT_SIZE;
case PIPE_CAPF_MAX_TEXTURE_ANISOTROPY: case PIPE_CAPF_MAX_TEXTURE_ANISOTROPY:

4
src/gallium/drivers/etnaviv/etnaviv_screen.c
View File

@@ -305,8 +305,8 @@ etna_screen_get_paramf(struct pipe_screen *pscreen, enum pipe_capf param)
switch (param) { switch (param) {
case PIPE_CAPF_MAX_LINE_WIDTH: case PIPE_CAPF_MAX_LINE_WIDTH:
case PIPE_CAPF_MAX_LINE_WIDTH_AA: case PIPE_CAPF_MAX_LINE_WIDTH_AA:
case PIPE_CAPF_MAX_POINT_WIDTH: case PIPE_CAPF_MAX_POINT_SIZE:
case PIPE_CAPF_MAX_POINT_WIDTH_AA: case PIPE_CAPF_MAX_POINT_SIZE_AA:
return 8192.0f; return 8192.0f;
case PIPE_CAPF_MAX_TEXTURE_ANISOTROPY: case PIPE_CAPF_MAX_TEXTURE_ANISOTROPY:
return 16.0f; return 16.0f;

4
src/gallium/drivers/freedreno/freedreno_screen.c
View File

@@ -547,8 +547,8 @@ fd_screen_get_paramf(struct pipe_screen *pscreen, enum pipe_capf param)
if (FD_DBG(DEQP)) if (FD_DBG(DEQP))
return 48.0f; return 48.0f;
return 127.0f; return 127.0f;
case PIPE_CAPF_MAX_POINT_WIDTH: case PIPE_CAPF_MAX_POINT_SIZE:
case PIPE_CAPF_MAX_POINT_WIDTH_AA: case PIPE_CAPF_MAX_POINT_SIZE_AA:
return 4092.0f; return 4092.0f;
case PIPE_CAPF_MAX_TEXTURE_ANISOTROPY: case PIPE_CAPF_MAX_TEXTURE_ANISOTROPY:
return 16.0f; return 16.0f;

4
src/gallium/drivers/i915/i915_screen.c
View File

@@ -503,9 +503,9 @@ i915_get_paramf(struct pipe_screen *screen, enum pipe_capf cap)
case PIPE_CAPF_MAX_LINE_WIDTH_AA: case PIPE_CAPF_MAX_LINE_WIDTH_AA:
return 7.5; return 7.5;
case PIPE_CAPF_MAX_POINT_WIDTH: case PIPE_CAPF_MAX_POINT_SIZE:
FALLTHROUGH; FALLTHROUGH;
case PIPE_CAPF_MAX_POINT_WIDTH_AA: case PIPE_CAPF_MAX_POINT_SIZE_AA:
return 255.0; return 255.0;
case PIPE_CAPF_MAX_TEXTURE_ANISOTROPY: case PIPE_CAPF_MAX_TEXTURE_ANISOTROPY:

4
src/gallium/drivers/iris/iris_screen.c
View File

@@ -407,8 +407,8 @@ iris_get_paramf(struct pipe_screen *pscreen, enum pipe_capf param)
case PIPE_CAPF_MAX_LINE_WIDTH_AA: case PIPE_CAPF_MAX_LINE_WIDTH_AA:
return 7.375f; return 7.375f;
case PIPE_CAPF_MAX_POINT_WIDTH: case PIPE_CAPF_MAX_POINT_SIZE:
case PIPE_CAPF_MAX_POINT_WIDTH_AA: case PIPE_CAPF_MAX_POINT_SIZE_AA:
return 255.0f; return 255.0f;
case PIPE_CAPF_MAX_TEXTURE_ANISOTROPY: case PIPE_CAPF_MAX_TEXTURE_ANISOTROPY:

4
src/gallium/drivers/lima/lima_screen.c
View File

@@ -172,8 +172,8 @@ lima_screen_get_paramf(struct pipe_screen *pscreen, enum pipe_capf param)
switch (param) { switch (param) {
case PIPE_CAPF_MAX_LINE_WIDTH: case PIPE_CAPF_MAX_LINE_WIDTH:
case PIPE_CAPF_MAX_LINE_WIDTH_AA: case PIPE_CAPF_MAX_LINE_WIDTH_AA:
case PIPE_CAPF_MAX_POINT_WIDTH: case PIPE_CAPF_MAX_POINT_SIZE:
case PIPE_CAPF_MAX_POINT_WIDTH_AA: case PIPE_CAPF_MAX_POINT_SIZE_AA:
return 100.0f; return 100.0f;
case PIPE_CAPF_MAX_TEXTURE_ANISOTROPY: case PIPE_CAPF_MAX_TEXTURE_ANISOTROPY:
return 16.0f; return 16.0f;

4
src/gallium/drivers/llvmpipe/lp_screen.c
View File

@@ -437,9 +437,9 @@ llvmpipe_get_paramf(struct pipe_screen *screen, enum pipe_capf param)
FALLTHROUGH; FALLTHROUGH;
case PIPE_CAPF_MAX_LINE_WIDTH_AA: case PIPE_CAPF_MAX_LINE_WIDTH_AA:
return 255.0; /* arbitrary */ return 255.0; /* arbitrary */
case PIPE_CAPF_MAX_POINT_WIDTH: case PIPE_CAPF_MAX_POINT_SIZE:
FALLTHROUGH; FALLTHROUGH;
case PIPE_CAPF_MAX_POINT_WIDTH_AA: case PIPE_CAPF_MAX_POINT_SIZE_AA:
return LP_MAX_POINT_WIDTH; /* arbitrary */ return LP_MAX_POINT_WIDTH; /* arbitrary */
case PIPE_CAPF_MAX_TEXTURE_ANISOTROPY: case PIPE_CAPF_MAX_TEXTURE_ANISOTROPY:
return 16.0; /* not actually signficant at this time */ return 16.0; /* not actually signficant at this time */

4
src/gallium/drivers/nouveau/nv30/nv30_screen.c
View File

@@ -292,8 +292,8 @@ nv30_screen_get_paramf(struct pipe_screen *pscreen, enum pipe_capf param)
case PIPE_CAPF_MAX_LINE_WIDTH: case PIPE_CAPF_MAX_LINE_WIDTH:
case PIPE_CAPF_MAX_LINE_WIDTH_AA: case PIPE_CAPF_MAX_LINE_WIDTH_AA:
return 10.0; return 10.0;
case PIPE_CAPF_MAX_POINT_WIDTH: case PIPE_CAPF_MAX_POINT_SIZE:
case PIPE_CAPF_MAX_POINT_WIDTH_AA: case PIPE_CAPF_MAX_POINT_SIZE_AA:
return 64.0; return 64.0;
case PIPE_CAPF_MAX_TEXTURE_ANISOTROPY: case PIPE_CAPF_MAX_TEXTURE_ANISOTROPY:
return (eng3d->oclass >= NV40_3D_CLASS) ? 16.0 : 8.0; return (eng3d->oclass >= NV40_3D_CLASS) ? 16.0 : 8.0;

4
src/gallium/drivers/nouveau/nv50/nv50_screen.c
View File

@@ -519,8 +519,8 @@ nv50_screen_get_paramf(struct pipe_screen *pscreen, enum pipe_capf param)
case PIPE_CAPF_MAX_LINE_WIDTH: case PIPE_CAPF_MAX_LINE_WIDTH:
case PIPE_CAPF_MAX_LINE_WIDTH_AA: case PIPE_CAPF_MAX_LINE_WIDTH_AA:
return 10.0f; return 10.0f;
case PIPE_CAPF_MAX_POINT_WIDTH: case PIPE_CAPF_MAX_POINT_SIZE:
case PIPE_CAPF_MAX_POINT_WIDTH_AA: case PIPE_CAPF_MAX_POINT_SIZE_AA:
return 64.0f; return 64.0f;
case PIPE_CAPF_MAX_TEXTURE_ANISOTROPY: case PIPE_CAPF_MAX_TEXTURE_ANISOTROPY:
return 16.0f; return 16.0f;

4
src/gallium/drivers/nouveau/nvc0/nvc0_screen.c
View File

@@ -576,9 +576,9 @@ nvc0_screen_get_paramf(struct pipe_screen *pscreen, enum pipe_capf param)
case PIPE_CAPF_MAX_LINE_WIDTH: case PIPE_CAPF_MAX_LINE_WIDTH:
case PIPE_CAPF_MAX_LINE_WIDTH_AA: case PIPE_CAPF_MAX_LINE_WIDTH_AA:
return 10.0f; return 10.0f;
case PIPE_CAPF_MAX_POINT_WIDTH: case PIPE_CAPF_MAX_POINT_SIZE:
return 63.0f; return 63.0f;
case PIPE_CAPF_MAX_POINT_WIDTH_AA: case PIPE_CAPF_MAX_POINT_SIZE_AA:
return 63.375f; return 63.375f;
case PIPE_CAPF_MAX_TEXTURE_ANISOTROPY: case PIPE_CAPF_MAX_TEXTURE_ANISOTROPY:
return 16.0f; return 16.0f;

4
src/gallium/drivers/panfrost/pan_screen.c
View File

@@ -462,10 +462,10 @@ panfrost_get_paramf(struct pipe_screen *screen, enum pipe_capf param)
case PIPE_CAPF_MAX_LINE_WIDTH_AA: case PIPE_CAPF_MAX_LINE_WIDTH_AA:
return 255.0; /* arbitrary */ return 255.0; /* arbitrary */
case PIPE_CAPF_MAX_POINT_WIDTH: case PIPE_CAPF_MAX_POINT_SIZE:
FALLTHROUGH; FALLTHROUGH;
case PIPE_CAPF_MAX_POINT_WIDTH_AA: case PIPE_CAPF_MAX_POINT_SIZE_AA:
return 1024.0; return 1024.0;
case PIPE_CAPF_MAX_TEXTURE_ANISOTROPY: case PIPE_CAPF_MAX_TEXTURE_ANISOTROPY:

4
src/gallium/drivers/r300/r300_screen.c
View File

@@ -408,8 +408,8 @@ static float r300_get_paramf(struct pipe_screen* pscreen,
switch (param) { switch (param) {
case PIPE_CAPF_MAX_LINE_WIDTH: case PIPE_CAPF_MAX_LINE_WIDTH:
case PIPE_CAPF_MAX_LINE_WIDTH_AA: case PIPE_CAPF_MAX_LINE_WIDTH_AA:
case PIPE_CAPF_MAX_POINT_WIDTH: case PIPE_CAPF_MAX_POINT_SIZE:
case PIPE_CAPF_MAX_POINT_WIDTH_AA: case PIPE_CAPF_MAX_POINT_SIZE_AA:
/* The maximum dimensions of the colorbuffer are our practical /* The maximum dimensions of the colorbuffer are our practical
* rendering limits. 2048 pixels should be enough for anybody. */ * rendering limits. 2048 pixels should be enough for anybody. */
if (r300screen->caps.is_r500) { if (r300screen->caps.is_r500) {

2
src/gallium/drivers/r300/r300_state.c
View File

@@ -1173,7 +1173,7 @@ static void* r300_create_rs_state(struct pipe_context* pipe,
* Clamp to [0, max FB size] */ * Clamp to [0, max FB size] */
float min_psiz = util_get_min_point_size(state); float min_psiz = util_get_min_point_size(state);
float max_psiz = pipe->screen->get_paramf(pipe->screen, float max_psiz = pipe->screen->get_paramf(pipe->screen,
PIPE_CAPF_MAX_POINT_WIDTH); PIPE_CAPF_MAX_POINT_SIZE);
point_minmax = point_minmax =
(pack_float_16_6x(min_psiz) << R300_GA_POINT_MINMAX_MIN_SHIFT) | (pack_float_16_6x(min_psiz) << R300_GA_POINT_MINMAX_MIN_SHIFT) |
(pack_float_16_6x(max_psiz) << R300_GA_POINT_MINMAX_MAX_SHIFT); (pack_float_16_6x(max_psiz) << R300_GA_POINT_MINMAX_MAX_SHIFT);

4
src/gallium/drivers/r600/r600_pipe_common.c
View File

@@ -809,8 +809,8 @@ static float r600_get_paramf(struct pipe_screen* pscreen,
switch (param) { switch (param) {
case PIPE_CAPF_MAX_LINE_WIDTH: case PIPE_CAPF_MAX_LINE_WIDTH:
case PIPE_CAPF_MAX_LINE_WIDTH_AA: case PIPE_CAPF_MAX_LINE_WIDTH_AA:
case PIPE_CAPF_MAX_POINT_WIDTH: case PIPE_CAPF_MAX_POINT_SIZE:
case PIPE_CAPF_MAX_POINT_WIDTH_AA: case PIPE_CAPF_MAX_POINT_SIZE_AA:
return 8191.0f; return 8191.0f;
case PIPE_CAPF_MAX_TEXTURE_ANISOTROPY: case PIPE_CAPF_MAX_TEXTURE_ANISOTROPY:
return 16.0f; return 16.0f;

4
src/gallium/drivers/radeonsi/si_get.c
View File

@@ -359,8 +359,8 @@ static float si_get_paramf(struct pipe_screen *pscreen, enum pipe_capf param)
/* This depends on the quant mode, though the precise interactions /* This depends on the quant mode, though the precise interactions
* are unknown. */ * are unknown. */
return 2048; return 2048;
case PIPE_CAPF_MAX_POINT_WIDTH: case PIPE_CAPF_MAX_POINT_SIZE:
case PIPE_CAPF_MAX_POINT_WIDTH_AA: case PIPE_CAPF_MAX_POINT_SIZE_AA:
return SI_MAX_POINT_SIZE; return SI_MAX_POINT_SIZE;
case PIPE_CAPF_MAX_TEXTURE_ANISOTROPY: case PIPE_CAPF_MAX_TEXTURE_ANISOTROPY:
return 16.0f; return 16.0f;

4
src/gallium/drivers/softpipe/sp_screen.c
View File

@@ -352,9 +352,9 @@ softpipe_get_paramf(struct pipe_screen *screen, enum pipe_capf param)
FALLTHROUGH; FALLTHROUGH;
case PIPE_CAPF_MAX_LINE_WIDTH_AA: case PIPE_CAPF_MAX_LINE_WIDTH_AA:
return 255.0; /* arbitrary */ return 255.0; /* arbitrary */
case PIPE_CAPF_MAX_POINT_WIDTH: case PIPE_CAPF_MAX_POINT_SIZE:
FALLTHROUGH; FALLTHROUGH;
case PIPE_CAPF_MAX_POINT_WIDTH_AA: case PIPE_CAPF_MAX_POINT_SIZE_AA:
return 255.0; /* arbitrary */ return 255.0; /* arbitrary */
case PIPE_CAPF_MAX_TEXTURE_ANISOTROPY: case PIPE_CAPF_MAX_TEXTURE_ANISOTROPY:
return 16.0; return 16.0;

4
src/gallium/drivers/svga/svga_screen.c
View File

@@ -158,9 +158,9 @@ svga_get_paramf(struct pipe_screen *screen, enum pipe_capf param)
case PIPE_CAPF_MAX_LINE_WIDTH_AA: case PIPE_CAPF_MAX_LINE_WIDTH_AA:
return svgascreen->maxLineWidthAA; return svgascreen->maxLineWidthAA;
case PIPE_CAPF_MAX_POINT_WIDTH: case PIPE_CAPF_MAX_POINT_SIZE:
FALLTHROUGH; FALLTHROUGH;
case PIPE_CAPF_MAX_POINT_WIDTH_AA: case PIPE_CAPF_MAX_POINT_SIZE_AA:
return svgascreen->maxPointSize; return svgascreen->maxPointSize;
case PIPE_CAPF_MAX_TEXTURE_ANISOTROPY: case PIPE_CAPF_MAX_TEXTURE_ANISOTROPY:

4
src/gallium/drivers/swr/swr_screen.cpp
View File

@@ -367,9 +367,9 @@ swr_get_paramf(struct pipe_screen *screen, enum pipe_capf param)
switch (param) { switch (param) {
case PIPE_CAPF_MAX_LINE_WIDTH: case PIPE_CAPF_MAX_LINE_WIDTH:
case PIPE_CAPF_MAX_LINE_WIDTH_AA: case PIPE_CAPF_MAX_LINE_WIDTH_AA:
case PIPE_CAPF_MAX_POINT_WIDTH: case PIPE_CAPF_MAX_POINT_SIZE:
return 255.0; /* arbitrary */ return 255.0; /* arbitrary */
case PIPE_CAPF_MAX_POINT_WIDTH_AA: case PIPE_CAPF_MAX_POINT_SIZE_AA:
return 0.0; return 0.0;
case PIPE_CAPF_MAX_TEXTURE_ANISOTROPY: case PIPE_CAPF_MAX_TEXTURE_ANISOTROPY:
return 0.0; return 0.0;

4
src/gallium/drivers/v3d/v3d_screen.c
View File

@@ -295,8 +295,8 @@ v3d_screen_get_paramf(struct pipe_screen *pscreen, enum pipe_capf param)
case PIPE_CAPF_MAX_LINE_WIDTH_AA: case PIPE_CAPF_MAX_LINE_WIDTH_AA:
return V3D_MAX_LINE_WIDTH; return V3D_MAX_LINE_WIDTH;
case PIPE_CAPF_MAX_POINT_WIDTH: case PIPE_CAPF_MAX_POINT_SIZE:
case PIPE_CAPF_MAX_POINT_WIDTH_AA: case PIPE_CAPF_MAX_POINT_SIZE_AA:
return V3D_MAX_POINT_SIZE; return V3D_MAX_POINT_SIZE;
case PIPE_CAPF_MAX_TEXTURE_ANISOTROPY: case PIPE_CAPF_MAX_TEXTURE_ANISOTROPY:

4
src/gallium/drivers/vc4/vc4_screen.c
View File

@@ -220,8 +220,8 @@ vc4_screen_get_paramf(struct pipe_screen *pscreen, enum pipe_capf param)
case PIPE_CAPF_MAX_LINE_WIDTH_AA: case PIPE_CAPF_MAX_LINE_WIDTH_AA:
return 32; return 32;
case PIPE_CAPF_MAX_POINT_WIDTH: case PIPE_CAPF_MAX_POINT_SIZE:
case PIPE_CAPF_MAX_POINT_WIDTH_AA: case PIPE_CAPF_MAX_POINT_SIZE_AA:
return 512.0f; return 512.0f;
case PIPE_CAPF_MAX_TEXTURE_ANISOTROPY: case PIPE_CAPF_MAX_TEXTURE_ANISOTROPY:

4
src/gallium/drivers/virgl/virgl_screen.c
View File

@@ -463,9 +463,9 @@ virgl_get_paramf(struct pipe_screen *screen, enum pipe_capf param)
return vscreen->caps.caps.v2.max_aliased_line_width; return vscreen->caps.caps.v2.max_aliased_line_width;
case PIPE_CAPF_MAX_LINE_WIDTH_AA: case PIPE_CAPF_MAX_LINE_WIDTH_AA:
return vscreen->caps.caps.v2.max_smooth_line_width; return vscreen->caps.caps.v2.max_smooth_line_width;
case PIPE_CAPF_MAX_POINT_WIDTH: case PIPE_CAPF_MAX_POINT_SIZE:
return vscreen->caps.caps.v2.max_aliased_point_size; return vscreen->caps.caps.v2.max_aliased_point_size;
case PIPE_CAPF_MAX_POINT_WIDTH_AA: case PIPE_CAPF_MAX_POINT_SIZE_AA:
return vscreen->caps.caps.v2.max_smooth_point_size; return vscreen->caps.caps.v2.max_smooth_point_size;
case PIPE_CAPF_MAX_TEXTURE_ANISOTROPY: case PIPE_CAPF_MAX_TEXTURE_ANISOTROPY:
return vscreen->caps.caps.v2.max_anisotropy; return vscreen->caps.caps.v2.max_anisotropy;

4
src/gallium/drivers/zink/zink_screen.c
View File

@@ -702,8 +702,8 @@ zink_get_paramf(struct pipe_screen *pscreen, enum pipe_capf param)
return 1.0f; return 1.0f;
return screen->info.props.limits.lineWidthRange[1]; return screen->info.props.limits.lineWidthRange[1];
case PIPE_CAPF_MAX_POINT_WIDTH: case PIPE_CAPF_MAX_POINT_SIZE:
case PIPE_CAPF_MAX_POINT_WIDTH_AA: case PIPE_CAPF_MAX_POINT_SIZE_AA:
if (!screen->info.feats.features.largePoints) if (!screen->info.feats.features.largePoints)
return 1.0f; return 1.0f;
return screen->info.props.limits.pointSizeRange[1]; return screen->info.props.limits.pointSizeRange[1];

2
src/gallium/frontends/lavapipe/lvp_device.c
View File

@@ -804,7 +804,7 @@ VKAPI_ATTR void VKAPI_CALL lvp_GetPhysicalDeviceProperties(VkPhysicalDevice phys
.maxCullDistances = 8, .maxCullDistances = 8,
.maxCombinedClipAndCullDistances = 8, .maxCombinedClipAndCullDistances = 8,
.discreteQueuePriorities = 2, .discreteQueuePriorities = 2,
.pointSizeRange = { 0.0, pdevice->pscreen->get_paramf(pdevice->pscreen, PIPE_CAPF_MAX_POINT_WIDTH) }, .pointSizeRange = { 0.0, pdevice->pscreen->get_paramf(pdevice->pscreen, PIPE_CAPF_MAX_POINT_SIZE) },
.lineWidthRange = { 1.0, pdevice->pscreen->get_paramf(pdevice->pscreen, PIPE_CAPF_MAX_LINE_WIDTH) }, .lineWidthRange = { 1.0, pdevice->pscreen->get_paramf(pdevice->pscreen, PIPE_CAPF_MAX_LINE_WIDTH) },
.pointSizeGranularity = (1.0 / 8.0), .pointSizeGranularity = (1.0 / 8.0),
.lineWidthGranularity = 1.0 / 128.0, .lineWidthGranularity = 1.0 / 128.0,

2
src/gallium/frontends/nine/adapter9.c
View File

@@ -845,7 +845,7 @@ NineAdapter9_GetDeviceCaps( struct NineAdapter9 *This,
pCaps->MaxVertexBlendMatrices = 4; /* 1 vec4 BLENDWEIGHT/INDICES input */ pCaps->MaxVertexBlendMatrices = 4; /* 1 vec4 BLENDWEIGHT/INDICES input */
pCaps->MaxVertexBlendMatrixIndex = 8; /* D3DTS_WORLDMATRIX(0..8) */ pCaps->MaxVertexBlendMatrixIndex = 8; /* D3DTS_WORLDMATRIX(0..8) */
pCaps->MaxPointSize = screen->get_paramf(screen, PIPE_CAPF_MAX_POINT_WIDTH); pCaps->MaxPointSize = screen->get_paramf(screen, PIPE_CAPF_MAX_POINT_SIZE);
pCaps->MaxPrimitiveCount = 0x555555; /* <- wine, really 0xFFFFFFFF; */ pCaps->MaxPrimitiveCount = 0x555555; /* <- wine, really 0xFFFFFFFF; */
pCaps->MaxVertexIndex = 0xFFFFFF; /* <- wine, really 0xFFFFFFFF */ pCaps->MaxVertexIndex = 0xFFFFFF; /* <- wine, really 0xFFFFFFFF */

4
src/gallium/include/pipe/p_defines.h
View File

@@ -1036,8 +1036,8 @@ enum pipe_capf
{ {
PIPE_CAPF_MAX_LINE_WIDTH, PIPE_CAPF_MAX_LINE_WIDTH,
PIPE_CAPF_MAX_LINE_WIDTH_AA, PIPE_CAPF_MAX_LINE_WIDTH_AA,
PIPE_CAPF_MAX_POINT_WIDTH, PIPE_CAPF_MAX_POINT_SIZE,
PIPE_CAPF_MAX_POINT_WIDTH_AA, PIPE_CAPF_MAX_POINT_SIZE_AA,
PIPE_CAPF_MAX_TEXTURE_ANISOTROPY, PIPE_CAPF_MAX_TEXTURE_ANISOTROPY,
PIPE_CAPF_MAX_TEXTURE_LOD_BIAS, PIPE_CAPF_MAX_TEXTURE_LOD_BIAS,
PIPE_CAPF_MIN_CONSERVATIVE_RASTER_DILATE, PIPE_CAPF_MIN_CONSERVATIVE_RASTER_DILATE,

4
src/mesa/state_tracker/st_extensions.c
View File

@@ -131,9 +131,9 @@ void st_init_limits(struct pipe_screen *screen,
_maxf(1.0f, screen->get_paramf(screen, PIPE_CAPF_MAX_LINE_WIDTH_AA)); _maxf(1.0f, screen->get_paramf(screen, PIPE_CAPF_MAX_LINE_WIDTH_AA));
c->MaxPointSize = c->MaxPointSize =
_maxf(1.0f, screen->get_paramf(screen, PIPE_CAPF_MAX_POINT_WIDTH)); _maxf(1.0f, screen->get_paramf(screen, PIPE_CAPF_MAX_POINT_SIZE));
c->MaxPointSizeAA = c->MaxPointSizeAA =
_maxf(1.0f, screen->get_paramf(screen, PIPE_CAPF_MAX_POINT_WIDTH_AA)); _maxf(1.0f, screen->get_paramf(screen, PIPE_CAPF_MAX_POINT_SIZE_AA));
c->MinPointSize = 1.0f; c->MinPointSize = 1.0f;
c->MinPointSizeAA = 1.0f; c->MinPointSizeAA = 1.0f;