diff --git a/src/emulator.c b/src/emulator.c index b55cfb59..363b5ee8 100644 --- a/src/emulator.c +++ b/src/emulator.c @@ -121,8 +121,8 @@ static void *emu_video_thread(void *data) { break; } - /* parse the context, uploading its textures to the render backend */ - tr_parse_context(emu->tr, emu->pending_ctx, &emu->video_rc); + /* convert the context, uploading its textures to the render backend */ + tr_convert_context(emu->tr, emu->pending_ctx, &emu->video_rc); emu->pending_ctx = NULL; /* after the context has been parsed, release the mutex to let @@ -276,8 +276,8 @@ static void emu_start_render(void *userdata, struct tile_context *ctx) { mutex_unlock(emu->pending_mutex); } else { - /* parse the context and immediately render it */ - tr_parse_context(emu->tr, ctx, &emu->video_rc); + /* convert the context and immediately render it */ + tr_convert_context(emu->tr, ctx, &emu->video_rc); emu_render_frame(emu); } diff --git a/src/hw/pvr/tr.c b/src/hw/pvr/tr.c index 0793709a..0bb893cb 100644 --- a/src/hw/pvr/tr.c +++ b/src/hw/pvr/tr.c @@ -954,9 +954,9 @@ void tr_render_context(struct tr *tr, const struct tr_context *rc) { PROF_LEAVE(); } -void tr_parse_context(struct tr *tr, const struct tile_context *ctx, +void tr_convert_context(struct tr *tr, const struct tile_context *ctx, struct tr_context *rc) { - PROF_ENTER("gpu", "tr_parse_context"); + PROF_ENTER("gpu", "tr_convert_context"); const uint8_t *data = ctx->params; const uint8_t *end = ctx->params + ctx->size; diff --git a/src/hw/pvr/tr.h b/src/hw/pvr/tr.h index ee0130d3..ac9e340a 100644 --- a/src/hw/pvr/tr.h +++ b/src/hw/pvr/tr.h @@ -86,7 +86,7 @@ static inline tr_texture_key_t tr_texture_key(union tsp tsp, union tcw tcw) { struct tr *tr_create(struct render_backend *rb, struct tr_provider *provider); void tr_destroy(struct tr *tr); -void tr_parse_context(struct tr *tr, const struct tile_context *ctx, +void tr_convert_context(struct tr *tr, const struct tile_context *ctx, struct tr_context *rc); void tr_render_context(struct tr *tr, const struct tr_context *rc); diff --git a/src/tracer.c b/src/tracer.c index 776293dc..b14bf28b 100644 --- a/src/tracer.c +++ b/src/tracer.c @@ -235,7 +235,7 @@ static void tracer_prev_context(struct tracer *tracer) { tracer->current_param = -1; tracer->scroll_to_param = 0; tracer_copy_context(tracer->current_cmd, &tracer->ctx); - tr_parse_context(tracer->tr, &tracer->ctx, &tracer->rc); + tr_convert_context(tracer->tr, &tracer->ctx, &tracer->rc); } static void tracer_next_context(struct tracer *tracer) { @@ -272,7 +272,7 @@ static void tracer_next_context(struct tracer *tracer) { tracer->current_param = -1; tracer->scroll_to_param = 0; tracer_copy_context(tracer->current_cmd, &tracer->ctx); - tr_parse_context(tracer->tr, &tracer->ctx, &tracer->rc); + tr_convert_context(tracer->tr, &tracer->ctx, &tracer->rc); } static void tracer_reset_context(struct tracer *tracer) {