third_party
/
virglrenderer
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

vrend: refactor storage enum

Browse Source 
It's a bit misleading currently. For example, all resources have
guest memory associated with them, and resource can be both a GL
texture and GBM buffer at the same time. Use bits to more accurately
capture this.

No functional change.

Reviewed-by: Gert Wollny <gert.wollny@collabora.com>
macos/master
Gurchetan Singh 6 years ago
parent f29b1b6e44
commit 98d2b366db
2 changed files with 48 additions and 54 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 80
      src/vrend_renderer.c
  2. 22
      src/vrend_renderer.h

80
src/vrend_renderer.c
Unescape View File

@ -49,6 +49,8 @@
#include "vrend_renderer.h" #include "vrend_renderer.h"
#include "vrend_debug.h" #include "vrend_debug.h"
#include "vrend_util.h"
#include "virgl_hw.h" #include "virgl_hw.h"
#include "virglrenderer.h" #include "virglrenderer.h"
@ -1730,7 +1732,7 @@ int vrend_create_surface(struct vrend_context *ctx,
surf->id = res->id; surf->id = res->id;
if (has_feature(feat_texture_view) && if (has_feature(feat_texture_view) &&
res->storage != VREND_RESOURCE_STORAGE_BUFFER && !has_bit(res->storage_bits, VREND_STORAGE_GL_BUFFER) &&
(tex_conv_table[format].flags & VIRGL_TEXTURE_CAN_TEXTURE_STORAGE)) { (tex_conv_table[format].flags & VIRGL_TEXTURE_CAN_TEXTURE_STORAGE)) {
/* We don't need texture views for buffer objects. /* We don't need texture views for buffer objects.
* Otherwise we only need a texture view if the * Otherwise we only need a texture view if the
@ -2055,7 +2057,7 @@ int vrend_create_sampler_view(struct vrend_context *ctx,
view->gl_swizzle_a = to_gl_swizzle(swizzle[3]); view->gl_swizzle_a = to_gl_swizzle(swizzle[3]);
if (has_feature(feat_texture_view) && if (has_feature(feat_texture_view) &&
view->texture->storage != VREND_RESOURCE_STORAGE_BUFFER) { !has_bit(view->texture->storage_bits, VREND_STORAGE_GL_BUFFER)) {
enum virgl_formats format; enum virgl_formats format;
bool needs_view = false; bool needs_view = false;
@ -2811,7 +2813,7 @@ void vrend_set_single_sampler_view(struct vrend_context *ctx,
ctx->sub->sampler_views_dirty[shader_type] |= 1u << index; ctx->sub->sampler_views_dirty[shader_type] |= 1u << index;
if (view->texture->storage != VREND_RESOURCE_STORAGE_BUFFER) { if (!has_bit(view->texture->storage_bits, VREND_STORAGE_GL_BUFFER)) {
if (view->texture->id == view->id) { if (view->texture->id == view->id) {
glBindTexture(view->target, view->id); glBindTexture(view->target, view->id);
@ -3967,7 +3969,7 @@ static int vrend_draw_bind_samplers_shader(struct vrend_context *ctx,
debug_texture(__func__, tview->texture); debug_texture(__func__, tview->texture);
if (texture->storage == VREND_RESOURCE_STORAGE_BUFFER) { if (has_bit(tview->texture->storage_bits, VREND_STORAGE_GL_BUFFER)) {
id = texture->tbo_tex_id; id = texture->tbo_tex_id;
target = GL_TEXTURE_BUFFER; target = GL_TEXTURE_BUFFER;
} else } else
@ -4123,7 +4125,7 @@ static void vrend_draw_bind_images_shader(struct vrend_context *ctx, int shader_
continue; continue;
iview = &ctx->sub->image_views[shader_type][i]; iview = &ctx->sub->image_views[shader_type][i];
tex_id = iview->texture->id; tex_id = iview->texture->id;
if (iview->texture->storage == VREND_RESOURCE_STORAGE_BUFFER) { if (has_bit(iview->texture->storage_bits, VREND_STORAGE_GL_BUFFER)) {
if (!iview->texture->tbo_tex_id) if (!iview->texture->tbo_tex_id)
glGenTextures(1, &iview->texture->tbo_tex_id); glGenTextures(1, &iview->texture->tbo_tex_id);
@ -5430,7 +5432,7 @@ static void vrend_apply_sampler_state(struct vrend_context *ctx,
return; return;
} }
if (tex->base.storage == VREND_RESOURCE_STORAGE_BUFFER) { if (has_bit(tex->base.storage_bits, VREND_STORAGE_GL_BUFFER)) {
tex->state = *state; tex->state = *state;
return; return;
} }
@ -6028,7 +6030,7 @@ int vrend_renderer_resource_attach_iov(int res_handle, struct iovec *iov,
res->iov = iov; res->iov = iov;
res->num_iovs = num_iovs; res->num_iovs = num_iovs;
if (res->storage == VREND_RESOURCE_STORAGE_GUEST_ELSE_SYSTEM) { if (has_bit(res->storage_bits, VREND_STORAGE_HOST_SYSTEM_MEMORY)) {
vrend_write_to_iovec(res->iov, res->num_iovs, 0, vrend_write_to_iovec(res->iov, res->num_iovs, 0,
res->ptr, res->base.width0); res->ptr, res->base.width0);
} }
@ -6050,7 +6052,7 @@ void vrend_renderer_resource_detach_iov(int res_handle,
if (num_iovs_p) if (num_iovs_p)
*num_iovs_p = res->num_iovs; *num_iovs_p = res->num_iovs;
if (res->storage == VREND_RESOURCE_STORAGE_GUEST_ELSE_SYSTEM) { if (has_bit(res->storage_bits, VREND_STORAGE_HOST_SYSTEM_MEMORY)) {
vrend_read_from_iovec(res->iov, res->num_iovs, 0, vrend_read_from_iovec(res->iov, res->num_iovs, 0,
res->ptr, res->base.width0); res->ptr, res->base.width0);
} }
@ -6293,7 +6295,7 @@ static int check_resource_valid(struct vrend_renderer_resource_create_args *args
static void vrend_create_buffer(struct vrend_resource *gr, uint32_t width) static void vrend_create_buffer(struct vrend_resource *gr, uint32_t width)
{ {
gr->storage = VREND_RESOURCE_STORAGE_BUFFER; gr->storage_bits |= VREND_STORAGE_GL_BUFFER;
glGenBuffersARB(1, &gr->id); glGenBuffersARB(1, &gr->id);
glBindBufferARB(gr->target, gr->id); glBindBufferARB(gr->target, gr->id);
@ -6320,8 +6322,9 @@ vrend_renderer_resource_copy_args(struct vrend_renderer_resource_create_args *ar
gr->base.array_size = args->array_size; gr->base.array_size = args->array_size;
} }
/* Does gbm related initialization of gr. If this function fully initializes /*
* the resource, then it sets gr->storage to VREND_RESOURCE_STORAGE_GBM_ONLY. * When GBM allocation is enabled, this function creates a GBM buffer and
* EGL image given certain flags.
*/ */
static void vrend_resource_gbm_init(struct vrend_resource *gr) static void vrend_resource_gbm_init(struct vrend_resource *gr)
{ {
@ -6347,12 +6350,12 @@ static void vrend_resource_gbm_init(struct vrend_resource *gr)
gbm_format, gbm_flags); gbm_format, gbm_flags);
if (!bo) if (!bo)
return; return;
gr->gbm_bo = bo; gr->gbm_bo = bo;
gr->storage_bits |= VREND_STORAGE_GBM_BUFFER;
if (!virgl_gbm_gpu_import_required(gr->base.bind)) { if (!virgl_gbm_gpu_import_required(gr->base.bind))
gr->storage = VREND_RESOURCE_STORAGE_GBM_ONLY;
return; return;
}
gr->egl_image = virgl_egl_image_from_dmabuf(egl, bo); gr->egl_image = virgl_egl_image_from_dmabuf(egl, bo);
if (!gr->egl_image) { if (!gr->egl_image) {
@ -6360,6 +6363,8 @@ static void vrend_resource_gbm_init(struct vrend_resource *gr)
gbm_bo_destroy(bo); gbm_bo_destroy(bo);
} }
gr->storage_bits |= VREND_STORAGE_EGL_IMAGE;
#else #else
(void)gr; (void)gr;
#endif #endif
@ -6379,9 +6384,9 @@ static int vrend_renderer_resource_allocate_texture(struct vrend_resource *gr,
if (!image_oes) { if (!image_oes) {
vrend_resource_gbm_init(gr); vrend_resource_gbm_init(gr);
if (gr->storage == VREND_RESOURCE_STORAGE_GBM_ONLY) { if (gr->gbm_bo && !has_bit(gr->storage_bits, VREND_STORAGE_EGL_IMAGE))
return 0; return 0;
}
image_oes = gr->egl_image; image_oes = gr->egl_image;
} }
@ -6406,7 +6411,7 @@ static int vrend_renderer_resource_allocate_texture(struct vrend_resource *gr,
} }
gr->target = tgsitargettogltarget(pr->target, pr->nr_samples); gr->target = tgsitargettogltarget(pr->target, pr->nr_samples);
gr->storage = VREND_RESOURCE_STORAGE_TEXTURE; gr->storage_bits |= VREND_STORAGE_GL_TEXTURE;
/* ugly workaround for texture rectangle missing on GLES */ /* ugly workaround for texture rectangle missing on GLES */
if (vrend_state.use_gles && gr->target == GL_TEXTURE_RECTANGLE_NV) { if (vrend_state.use_gles && gr->target == GL_TEXTURE_RECTANGLE_NV) {
@ -6579,6 +6584,7 @@ int vrend_renderer_resource_create(struct vrend_renderer_resource_create_args *a
vrend_renderer_resource_copy_args(args, gr); vrend_renderer_resource_copy_args(args, gr);
gr->iov = iov; gr->iov = iov;
gr->num_iovs = num_iovs; gr->num_iovs = num_iovs;
gr->storage_bits = VREND_STORAGE_GUEST_MEMORY;
if (args->flags & VIRGL_RESOURCE_Y_0_TOP) if (args->flags & VIRGL_RESOURCE_Y_0_TOP)
gr->y_0_top = true; gr->y_0_top = true;
@ -6588,15 +6594,14 @@ int vrend_renderer_resource_create(struct vrend_renderer_resource_create_args *a
if (args->target == PIPE_BUFFER) { if (args->target == PIPE_BUFFER) {
if (args->bind == VIRGL_BIND_CUSTOM) { if (args->bind == VIRGL_BIND_CUSTOM) {
/* use iovec directly when attached */ /* use iovec directly when attached */
gr->storage = VREND_RESOURCE_STORAGE_GUEST_ELSE_SYSTEM; gr->storage_bits |= VREND_STORAGE_HOST_SYSTEM_MEMORY;
gr->ptr = malloc(args->width); gr->ptr = malloc(args->width);
if (!gr->ptr) { if (!gr->ptr) {
FREE(gr); FREE(gr);
return ENOMEM; return ENOMEM;
} }
} else if (args->bind == VIRGL_BIND_STAGING) { } else if (args->bind == VIRGL_BIND_STAGING) {
/* Staging buffers use only guest memory. */ /* staging buffers only use guest memory -- nothing to do. */
gr->storage = VREND_RESOURCE_STORAGE_GUEST;
} else if (args->bind == VIRGL_BIND_INDEX_BUFFER) { } else if (args->bind == VIRGL_BIND_INDEX_BUFFER) {
gr->target = GL_ELEMENT_ARRAY_BUFFER_ARB; gr->target = GL_ELEMENT_ARRAY_BUFFER_ARB;
vrend_create_buffer(gr, args->width); vrend_create_buffer(gr, args->width);
@ -6660,20 +6665,14 @@ void vrend_renderer_resource_destroy(struct vrend_resource *res)
if (res->readback_fb_id) if (res->readback_fb_id)
glDeleteFramebuffers(1, &res->readback_fb_id); glDeleteFramebuffers(1, &res->readback_fb_id);
switch (res->storage) { if (has_bit(res->storage_bits, VREND_STORAGE_GL_TEXTURE)) {
case VREND_RESOURCE_STORAGE_TEXTURE:
glDeleteTextures(1, &res->id); glDeleteTextures(1, &res->id);
break; } else if (has_bit(res->storage_bits, VREND_STORAGE_GL_BUFFER)) {
case VREND_RESOURCE_STORAGE_BUFFER:
glDeleteBuffers(1, &res->id); glDeleteBuffers(1, &res->id);
if (res->tbo_tex_id) if (res->tbo_tex_id)
glDeleteTextures(1, &res->tbo_tex_id); glDeleteTextures(1, &res->tbo_tex_id);
break; } else if (has_bit(res->storage_bits, VREND_STORAGE_HOST_SYSTEM_MEMORY)) {
case VREND_RESOURCE_STORAGE_GUEST_ELSE_SYSTEM:
free(res->ptr); free(res->ptr);
break;
default:
break;
} }
#ifdef ENABLE_GBM_ALLOCATION #ifdef ENABLE_GBM_ALLOCATION
@ -6973,21 +6972,21 @@ static int vrend_renderer_transfer_write_iov(struct vrend_context *ctx,
{ {
void *data; void *data;
if (res->storage == VREND_RESOURCE_STORAGE_GUEST || if (is_only_bit(res->storage_bits, VREND_STORAGE_GUEST_MEMORY) ||
(res->storage == VREND_RESOURCE_STORAGE_GUEST_ELSE_SYSTEM && res->iov)) { (has_bit(res->storage_bits, VREND_STORAGE_HOST_SYSTEM_MEMORY) && res->iov)) {
return vrend_copy_iovec(iov, num_iovs, info->offset, return vrend_copy_iovec(iov, num_iovs, info->offset,
res->iov, res->num_iovs, info->box->x, res->iov, res->num_iovs, info->box->x,
info->box->width, res->ptr); info->box->width, res->ptr);
} }
if (res->storage == VREND_RESOURCE_STORAGE_GUEST_ELSE_SYSTEM) { if (has_bit(res->storage_bits, VREND_STORAGE_HOST_SYSTEM_MEMORY)) {
assert(!res->iov); assert(!res->iov);
vrend_read_from_iovec(iov, num_iovs, info->offset, vrend_read_from_iovec(iov, num_iovs, info->offset,
res->ptr + info->box->x, info->box->width); res->ptr + info->box->x, info->box->width);
return 0; return 0;
} }
if (res->storage == VREND_RESOURCE_STORAGE_BUFFER) { if (has_bit(res->storage_bits, VREND_STORAGE_GL_BUFFER)) {
GLuint map_flags = GL_MAP_INVALIDATE_RANGE_BIT | GL_MAP_WRITE_BIT; GLuint map_flags = GL_MAP_INVALIDATE_RANGE_BIT | GL_MAP_WRITE_BIT;
struct virgl_sub_upload_data d; struct virgl_sub_upload_data d;
d.box = info->box; d.box = info->box;
@ -7523,21 +7522,21 @@ static int vrend_renderer_transfer_send_iov(struct vrend_resource *res,
struct iovec *iov, int num_iovs, struct iovec *iov, int num_iovs,
const struct vrend_transfer_info *info) const struct vrend_transfer_info *info)
{ {
if (res->storage == VREND_RESOURCE_STORAGE_GUEST || if (is_only_bit(res->storage_bits, VREND_STORAGE_GUEST_MEMORY) ||
(res->storage == VREND_RESOURCE_STORAGE_GUEST_ELSE_SYSTEM && res->iov)) { (has_bit(res->storage_bits, VREND_STORAGE_HOST_SYSTEM_MEMORY) && res->iov)) {
return vrend_copy_iovec(res->iov, res->num_iovs, info->box->x, return vrend_copy_iovec(res->iov, res->num_iovs, info->box->x,
iov, num_iovs, info->offset, iov, num_iovs, info->offset,
info->box->width, res->ptr); info->box->width, res->ptr);
} }
if (res->storage == VREND_RESOURCE_STORAGE_GUEST_ELSE_SYSTEM) { if (has_bit(res->storage_bits, VREND_STORAGE_HOST_SYSTEM_MEMORY)) {
assert(!res->iov); assert(!res->iov);
vrend_write_to_iovec(iov, num_iovs, info->offset, vrend_write_to_iovec(iov, num_iovs, info->offset,
res->ptr + info->box->x, info->box->width); res->ptr + info->box->x, info->box->width);
return 0; return 0;
} }
if (res->storage == VREND_RESOURCE_STORAGE_BUFFER) { if (has_bit(res->storage_bits, VREND_STORAGE_GL_BUFFER)) {
uint32_t send_size = info->box->width * util_format_get_blocksize(res->base.format); uint32_t send_size = info->box->width * util_format_get_blocksize(res->base.format);
void *data; void *data;
@ -7622,9 +7621,8 @@ int vrend_renderer_transfer_iov(const struct vrend_transfer_info *info,
} }
#ifdef ENABLE_GBM_ALLOCATION #ifdef ENABLE_GBM_ALLOCATION
if (res->gbm_bo && if (res->gbm_bo && (transfer_mode == VIRGL_TRANSFER_TO_HOST ||
(transfer_mode == VIRGL_TRANSFER_TO_HOST || !has_bit(res->storage_bits, VREND_STORAGE_EGL_IMAGE)))
res->storage == VREND_RESOURCE_STORAGE_GBM_ONLY))
return virgl_gbm_transfer(res->gbm_bo, transfer_mode, iov, num_iovs, info); return virgl_gbm_transfer(res->gbm_bo, transfer_mode, iov, num_iovs, info);
#endif #endif
@ -8860,7 +8858,7 @@ int vrend_create_query(struct vrend_context *ctx, uint32_t handle,
uint32_t ret_handle; uint32_t ret_handle;
bool fake_samples_passed = false; bool fake_samples_passed = false;
res = vrend_renderer_ctx_res_lookup(ctx, res_handle); res = vrend_renderer_ctx_res_lookup(ctx, res_handle);
if (!res || res->storage != VREND_RESOURCE_STORAGE_GUEST_ELSE_SYSTEM) { if (!res || !has_bit(res->storage_bits, VREND_STORAGE_HOST_SYSTEM_MEMORY)) {
report_context_error(ctx, VIRGL_ERROR_CTX_ILLEGAL_RESOURCE, res_handle); report_context_error(ctx, VIRGL_ERROR_CTX_ILLEGAL_RESOURCE, res_handle);
return EINVAL; return EINVAL;
} }

22
src/vrend_renderer.h
Unescape View File

@ -51,18 +51,12 @@ struct vrend_context;
*/ */
#define VR_MAX_TEXTURE_2D_LEVELS 15 #define VR_MAX_TEXTURE_2D_LEVELS 15
enum vrend_resource_storage_type { #define VREND_STORAGE_GUEST_MEMORY BIT(0)
/* A default value for zero-initalized struct vrend_resources */ #define VREND_STORAGE_GL_TEXTURE BIT(1)
VREND_RESOURCE_STORAGE_INIT = 0, #define VREND_STORAGE_GL_BUFFER BIT(2)
VREND_RESOURCE_STORAGE_TEXTURE, #define VREND_STORAGE_EGL_IMAGE BIT(3)
VREND_RESOURCE_STORAGE_BUFFER, #define VREND_STORAGE_GBM_BUFFER BIT(4)
/* The resource contents are stored in shared guest memory. */ #define VREND_STORAGE_HOST_SYSTEM_MEMORY BIT(5)
VREND_RESOURCE_STORAGE_GUEST,
/* The resource contents are stored in shared guest memory if it's
* attached, otherwise in host system memory. */
VREND_RESOURCE_STORAGE_GUEST_ELSE_SYSTEM,
VREND_RESOURCE_STORAGE_GBM_ONLY,
};
enum { enum {
CONTEXT_NONE, CONTEXT_NONE,
@ -78,9 +72,11 @@ extern struct virgl_egl *egl;
struct vrend_resource { struct vrend_resource {
struct pipe_resource base; struct pipe_resource base;
uint32_t storage_bits;
GLuint id; GLuint id;
GLenum target; GLenum target;
enum vrend_resource_storage_type storage;
/* fb id if we need to readback this resource */ /* fb id if we need to readback this resource */
GLuint readback_fb_id; GLuint readback_fb_id;
GLuint readback_fb_level; GLuint readback_fb_level;

Write Preview
Loading…
Cancel
Save