* USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include "util/u_memory.h"
-#include "util/u_format.h"
-#include "util/u_format_s3tc.h"
+#include "util/format/u_format.h"
+#include "util/format/u_format_s3tc.h"
#include "util/u_screen.h"
#include "util/u_video.h"
#include "util/u_math.h"
static const char *
virgl_get_vendor(struct pipe_screen *screen)
{
- return "Red Hat";
+ return "Mesa/X.org";
}
case PIPE_CAP_TGSI_FS_COORD_ORIGIN_LOWER_LEFT:
return vscreen->caps.caps.v1.bset.fragment_coord_conventions;
case PIPE_CAP_DEPTH_CLIP_DISABLE:
- return vscreen->caps.caps.v1.bset.depth_clip_disable;
+ if (vscreen->caps.caps.v1.bset.depth_clip_disable)
+ return 1;
+ if (vscreen->caps.caps.v2.host_feature_check_version >= 3)
+ return 2;
+ return 0;
case PIPE_CAP_MAX_STREAM_OUTPUT_BUFFERS:
return vscreen->caps.caps.v1.max_streamout_buffers;
case PIPE_CAP_MAX_STREAM_OUTPUT_SEPARATE_COMPONENTS:
case PIPE_CAP_MAX_STREAM_OUTPUT_INTERLEAVED_COMPONENTS:
return 16*4;
case PIPE_CAP_PRIMITIVE_RESTART:
+ case PIPE_CAP_PRIMITIVE_RESTART_FIXED_INDEX:
return vscreen->caps.caps.v1.bset.primitive_restart;
case PIPE_CAP_SHADER_STENCIL_EXPORT:
return vscreen->caps.caps.v1.bset.shader_stencil_export;
case PIPE_CAP_DEVICE_RESET_STATUS_QUERY:
case PIPE_CAP_DEPTH_BOUNDS_TEST:
case PIPE_CAP_SHAREABLE_SHADERS:
- case PIPE_CAP_CLEAR_TEXTURE:
case PIPE_CAP_DRAW_PARAMETERS:
case PIPE_CAP_TGSI_PACK_HALF_FLOAT:
case PIPE_CAP_TGSI_FS_POSITION_IS_SYSVAL:
case PIPE_CAP_PROGRAMMABLE_SAMPLE_LOCATIONS:
case PIPE_CAP_MAX_TEXTURE_UPLOAD_MEMORY_BUDGET:
return 0;
+ case PIPE_CAP_CLEAR_TEXTURE:
+ return vscreen->caps.caps.v2.capability_bits & VIRGL_CAP_CLEAR_TEXTURE;
case PIPE_CAP_CLIP_HALFZ:
return vscreen->caps.caps.v2.capability_bits & VIRGL_CAP_CLIP_HALFZ;
case PIPE_CAP_MAX_GS_INVOCATIONS:
case PIPE_SHADER_CAP_TGSI_SKIP_MERGE_REGISTERS:
case PIPE_SHADER_CAP_INT64_ATOMICS:
case PIPE_SHADER_CAP_FP16:
+ case PIPE_SHADER_CAP_FP16_DERIVATIVES:
+ case PIPE_SHADER_CAP_INT16:
+ case PIPE_SHADER_CAP_GLSL_16BIT_TEMPS:
return 0;
- case PIPE_SHADER_CAP_SCALAR_ISA:
- return 1;
default:
return 0;
}
uint32_t bitmask[16],
bool may_emulate_bgra)
{
- int big = format / 32;
- int small = format % 32;
+ enum virgl_formats vformat = pipe_to_virgl_format(format);
+ int big = vformat / 32;
+ int small = vformat % 32;
if ((bitmask[big] & (1 << small)))
return true;
return false;
}
- big = format / 32;
- small = format % 32;
+ vformat = pipe_to_virgl_format(format);
+ big = vformat / 32;
+ small = vformat % 32;
if (bitmask[big] & (1 << small))
return true;
}
const struct util_format_description *format_desc;
int i;
- boolean may_emulate_bgra = false;
+ union virgl_caps *caps = &vscreen->caps.caps;
+ boolean may_emulate_bgra = (caps->v2.capability_bits &
+ VIRGL_CAP_APP_TWEAK_SUPPORT) &&
+ vscreen->tweak_gles_emulate_bgra;
if (MAX2(1, sample_count) != MAX2(1, storage_sample_count))
return false;
+ if (!util_is_power_of_two_or_zero(sample_count))
+ return false;
+
assert(target == PIPE_BUFFER ||
target == PIPE_TEXTURE_1D ||
target == PIPE_TEXTURE_1D_ARRAY ||
return false;
if (sample_count > 1) {
- if (!vscreen->caps.caps.v1.bset.texture_multisample)
+ if (!caps->v1.bset.texture_multisample)
return false;
if (bind & PIPE_BIND_SHADER_IMAGE) {
- if (sample_count > vscreen->caps.caps.v2.max_image_samples)
+ if (sample_count > caps->v2.max_image_samples)
return false;
}
- if (sample_count > vscreen->caps.caps.v1.max_samples)
+ if (sample_count > caps->v1.max_samples)
return false;
}
target == PIPE_TEXTURE_3D)
return false;
- may_emulate_bgra = (vscreen->caps.caps.v2.capability_bits &
- VIRGL_CAP_APP_TWEAK_SUPPORT) &&
- vscreen->tweak_gles_emulate_bgra;
if (bind & PIPE_BIND_RENDER_TARGET) {
/* For ARB_framebuffer_no_attachments. */
/*
* Although possible, it is unnatural to render into compressed or YUV
* surfaces. So disable these here to avoid going into weird paths
- * inside the state trackers.
+ * inside gallium frontends.
*/
if (format_desc->block.width != 1 ||
format_desc->block.height != 1)
return false;
if (!virgl_format_check_bitmask(format,
- vscreen->caps.caps.v1.render.bitmask,
+ caps->v1.render.bitmask,
may_emulate_bgra))
return false;
}
return false;
}
+ if (bind & PIPE_BIND_SCANOUT) {
+ if (!virgl_format_check_bitmask(format, caps->v2.scanout.bitmask, false))
+ return false;
+ }
+
/*
* All other operations (sampling, transfer, etc).
*/
if (format_desc->layout == UTIL_FORMAT_LAYOUT_BPTC) {
goto out_lookup;
}
+ if (format_desc->layout == UTIL_FORMAT_LAYOUT_ETC) {
+ goto out_lookup;
+ }
if (format == PIPE_FORMAT_R11G11B10_FLOAT) {
goto out_lookup;
out_lookup:
return virgl_format_check_bitmask(format,
- vscreen->caps.caps.v1.sampler.bitmask,
+ caps->v1.sampler.bitmask,
may_emulate_bgra);
}
}
static void
-fixup_readback_format(union virgl_caps *caps)
+fixup_formats(union virgl_caps *caps, struct virgl_supported_format_mask *mask)
{
- const size_t size = ARRAY_SIZE(caps->v2.supported_readback_formats.bitmask);
+ const size_t size = ARRAY_SIZE(mask->bitmask);
for (int i = 0; i < size; ++i) {
- if (caps->v2.supported_readback_formats.bitmask[i] != 0)
+ if (mask->bitmask[i] != 0)
return; /* we got some formats, we definately have a new protocol */
}
/* old protocol used; fall back to considering all sampleable formats valid
* readback-formats
*/
- for (int i = 0; i < size; ++i) {
- caps->v2.supported_readback_formats.bitmask[i] =
- caps->v1.sampler.bitmask[i];
- }
+ for (int i = 0; i < size; ++i)
+ mask->bitmask[i] = caps->v1.sampler.bitmask[i];
}
struct pipe_screen *
virgl_init_screen_resource_functions(&screen->base);
vws->get_caps(vws, &screen->caps);
- fixup_readback_format(&screen->caps.caps);
+ fixup_formats(&screen->caps.caps,
+ &screen->caps.caps.v2.supported_readback_formats);
+ fixup_formats(&screen->caps.caps, &screen->caps.caps.v2.scanout);
screen->refcnt = 1;