(3DS) Buildfix

This commit is contained in:
twinaphex 2017-04-29 19:34:20 +02:00
parent 46bae549ac
commit 7df38ac5db

View File

@ -116,13 +116,16 @@ static void menu_display_ctr_draw(void *data)
GPU_MODULATE, GPU_MODULATE,
COLOR_ABGR(colorR,colorG,colorB,colorA)
);
// GPU_SetTexEnv(0,
// GPU_TEVSOURCES(GPU_CONSTANT, GPU_CONSTANT, 0),
// GPU_TEVSOURCES(GPU_CONSTANT, GPU_CONSTANT, 0),
// 0,
// GPU_TEVOPERANDS(GPU_TEVOP_RGB_SRC_COLOR, GPU_TEVOP_RGB_SRC_COLOR, 0),
// GPU_REPLACE, GPU_REPLACE,
// 0x3FFFFFFF);
#if 0
GPU_SetTexEnv(0,
GPU_TEVSOURCES(GPU_CONSTANT, GPU_CONSTANT, 0),
GPU_TEVSOURCES(GPU_CONSTANT, GPU_CONSTANT, 0),
0,
GPU_TEVOPERANDS(GPU_TEVOP_RGB_SRC_COLOR, GPU_TEVOP_RGB_SRC_COLOR, 0),
GPU_REPLACE, GPU_REPLACE,
0x3FFFFFFF);
#endif
ctrGuSetTexture(GPU_TEXUNIT0, VIRT_TO_PHYS(texture->data), texture->width, texture->height,
GPU_TEXTURE_MAG_FILTER(GPU_LINEAR) | GPU_TEXTURE_MIN_FILTER(GPU_LINEAR) |
@ -133,7 +136,8 @@ static void menu_display_ctr_draw(void *data)
GPU_SetViewport(NULL,
VIRT_TO_PHYS(ctr->drawbuffers.top.left),
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, 1);
@ -147,7 +151,11 @@ static void menu_display_ctr_draw(void *data)
}
GPU_SetTexEnv(0, GPU_TEXTURE0, GPU_TEXTURE0, 0, 0, GPU_REPLACE, GPU_REPLACE, 0);
// printf("(%i,%i,%i,%i) , (%i,%i)\n", (int)draw->x, (int)draw->y, (int)draw->width, (int)draw->height, texture->width, texture->height);
#if 0
printf("(%i,%i,%i,%i) , (%i,%i)\n", (int)draw->x,
(int)draw->y, (int)draw->width, (int)draw->height,
texture->width, texture->height);
#endif
}
static void menu_display_ctr_draw_pipeline(void *data)
@ -156,27 +164,34 @@ static void menu_display_ctr_draw_pipeline(void *data)
static void menu_display_ctr_restore_clear_color(void)
{
// ctr_set_clear_color(RGBA8(0x00, 0x00, 0x00, 0xFF));
#if 0
ctr_set_clear_color(RGBA8(0x00, 0x00, 0x00, 0xFF));
#endif
}
static void menu_display_ctr_clear_color(menu_display_ctx_clearcolor_t *clearcolor)
{
if (!clearcolor)
return;
// ctr_set_clear_color(RGBA8((int)(clearcolor->r*255.f),
// (int)(clearcolor->g*255.f),
// (int)(clearcolor->b*255.f),
// (int)(clearcolor->a*255.f)));
// ctr_clear_screen();
#if 0
ctr_set_clear_color(RGBA8((int)(clearcolor->r*255.f),
(int)(clearcolor->g*255.f),
(int)(clearcolor->b*255.f),
(int)(clearcolor->a*255.f)));
ctr_clear_screen();
#endif
}
static bool menu_display_ctr_font_init_first(
void **font_handle, void *video_data,
const char *font_path, float font_size)
const char *font_path, float font_size,
bool is_threaded)
{
font_data_t **handle = (font_data_t**)font_handle;
*handle = font_driver_init_first(video_data,
font_path, font_size, true, FONT_DRIVER_RENDER_CTR);
font_path, font_size, true,
is_threaded,
FONT_DRIVER_RENDER_CTR);
return *handle;
}