mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-16 17:43:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

(ctr_font.c) use #if 0 blocks

Browse Source
This commit is contained in:
twinaphex 2017-01-19 15:55:42 +01:00
parent 9d1de5c974
commit 4a8cb5687a
1 changed files with 46 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
gfx/drivers_font/ctr_font.c
View File

@ -33,7 +33,10 @@
/* FIXME: this is just a workaround to avoid /* FIXME: this is just a workaround to avoid
* using ctrGuCopyImage, since it seems to cause * using ctrGuCopyImage, since it seems to cause
* a freeze/blackscreen when used here. */ * a freeze/blackscreen when used here. */
//#define FONT_TEXTURE_IN_VRAM
#if 0
#define FONT_TEXTURE_IN_VRAM
#endif
typedef struct typedef struct
{ {
@ -227,7 +230,8 @@ static void ctr_font_render_line(
return; return;
ctrGuSetVertexShaderFloatUniform(0, (float*)&font->scale_vector, 1); ctrGuSetVertexShaderFloatUniform(0, (float*)&font->scale_vector, 1);
GSPGPU_FlushDataCache(ctr->vertex_cache.current, (v - ctr->vertex_cache.current) * sizeof(ctr_vertex_t)); GSPGPU_FlushDataCache(ctr->vertex_cache.current,
(v - ctr->vertex_cache.current) * sizeof(ctr_vertex_t));
ctrGuSetAttributeBuffers(2, ctrGuSetAttributeBuffers(2,
VIRT_TO_PHYS(ctr->vertex_cache.current), VIRT_TO_PHYS(ctr->vertex_cache.current),
CTRGU_ATTRIBFMT(GPU_SHORT, 4) << 0 | CTRGU_ATTRIBFMT(GPU_SHORT, 4) << 0 |
@ -241,10 +245,16 @@ static void ctr_font_render_line(
GPU_TEVOPERANDS(GPU_TEVOP_RGB_SRC_R, GPU_TEVOP_RGB_SRC_ALPHA, 0), GPU_TEVOPERANDS(GPU_TEVOP_RGB_SRC_R, GPU_TEVOP_RGB_SRC_ALPHA, 0),
GPU_MODULATE, GPU_MODULATE, GPU_MODULATE, GPU_MODULATE,
color); color);
// printf("%s\n", msg);
// DEBUG_VAR(color); #if 0
// GPU_SetTexEnv(0, GPU_TEXTURE0, GPU_TEXTURE0, 0, GPU_TEVOPERANDS(GPU_TEVOP_RGB_SRC_R, 0, 0), GPU_REPLACE, GPU_REPLACE, 0); printf("%s\n", msg);
ctrGuSetTexture(GPU_TEXUNIT0, VIRT_TO_PHYS(font->texture.data), font->texture.width, font->texture.height, DEBUG_VAR(color);
GPU_SetTexEnv(0, GPU_TEXTURE0, GPU_TEXTURE0, 0,
GPU_TEVOPERANDS(GPU_TEVOP_RGB_SRC_R, 0, 0), GPU_REPLACE, GPU_REPLACE, 0);
#endif
ctrGuSetTexture(GPU_TEXUNIT0, VIRT_TO_PHYS(font->texture.data),
font->texture.width, font->texture.height,
GPU_TEXTURE_MAG_FILTER(GPU_NEAREST) | GPU_TEXTURE_MIN_FILTER(GPU_NEAREST) | GPU_TEXTURE_MAG_FILTER(GPU_NEAREST) | GPU_TEXTURE_MIN_FILTER(GPU_NEAREST) |
GPU_TEXTURE_WRAP_S(GPU_CLAMP_TO_EDGE) | GPU_TEXTURE_WRAP_T(GPU_CLAMP_TO_EDGE), GPU_TEXTURE_WRAP_S(GPU_CLAMP_TO_EDGE) | GPU_TEXTURE_WRAP_T(GPU_CLAMP_TO_EDGE),
GPU_L8); GPU_L8);
@ -252,7 +262,8 @@ static void ctr_font_render_line(
GPU_SetViewport(NULL, GPU_SetViewport(NULL,
VIRT_TO_PHYS(ctr->drawbuffers.top.left), VIRT_TO_PHYS(ctr->drawbuffers.top.left),
0, 0, CTR_TOP_FRAMEBUFFER_HEIGHT, 0, 0, CTR_TOP_FRAMEBUFFER_HEIGHT,
ctr->video_mode == CTR_VIDEO_MODE_800x240 ? CTR_TOP_FRAMEBUFFER_WIDTH * 2 : CTR_TOP_FRAMEBUFFER_WIDTH); ctr->video_mode == CTR_VIDEO_MODE_800x240
? CTR_TOP_FRAMEBUFFER_WIDTH * 2 : CTR_TOP_FRAMEBUFFER_WIDTH);
GPU_DrawArray(GPU_GEOMETRY_PRIM, 0, v - ctr->vertex_cache.current); GPU_DrawArray(GPU_GEOMETRY_PRIM, 0, v - ctr->vertex_cache.current);
@ -265,29 +276,32 @@ static void ctr_font_render_line(
GPU_DrawArray(GPU_GEOMETRY_PRIM, 0, v - ctr->vertex_cache.current); GPU_DrawArray(GPU_GEOMETRY_PRIM, 0, v - ctr->vertex_cache.current);
} }
#if 0
v = font->vertices;
v->x0 = 0;
// v = font->vertices; v->y0 = 0;
// v->x0 = 0; v->u0 = 0;
// v->y0 = 0; v->v0 = 0;
// v->u0 = 0; v->x1 = font->texture.width;
// v->v0 = 0; v->y1 = font->texture.height;
// v->x1 = font->texture.width; v->u1 = font->texture.width;
// v->y1 = font->texture.height; v->v1 = font->texture.height;
// v->u1 = font->texture.width; GPU_DrawArray(GPU_GEOMETRY_PRIM, 0, 1);
// v->v1 = font->texture.height; #endif
// GPU_DrawArray(GPU_GEOMETRY_PRIM, 0, 1);
GPU_SetTexEnv(0, GPU_TEXTURE0, GPU_TEXTURE0, 0, 0, GPU_REPLACE, GPU_REPLACE, 0); GPU_SetTexEnv(0, GPU_TEXTURE0, GPU_TEXTURE0, 0, 0, GPU_REPLACE, GPU_REPLACE, 0);
// DEBUG_VAR(v - font->vertices);
// v = font->vertices;
// printf("OSDMSG: %s\n", msg);
// printf("vertex : (%i,%i,%i,%i) - (%i,%i,%i,%i)\n",
// v->x0, v->y0, v->x1, v->y1,
// v->u0, v->v0, v->u1, v->v1);
// printf("%s\n", msg); #if 0
DEBUG_VAR(v - font->vertices);
v = font->vertices;
printf("OSDMSG: %s\n", msg);
printf("vertex : (%i,%i,%i,%i) - (%i,%i,%i,%i)\n",
v->x0, v->y0, v->x1, v->y1,
v->u0, v->v0, v->u1, v->v1);
printf("%s\n", msg);
#endif
ctr->vertex_cache.current = v; ctr->vertex_cache.current = v;
} }