ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

nv2a: texture filters

This commit is contained in:
espes 2013-02-24 11:58:59 +11:00
parent be72221f20
commit a0e44a0c43
1 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
hw/nv2a.c
View File

@ -411,6 +411,9 @@
# define NV097_SET_TEXTURE_CONTROL0_MAX_LOD_CLAMP 0x0003FFC0 # define NV097_SET_TEXTURE_CONTROL0_MAX_LOD_CLAMP 0x0003FFC0
# define NV097_SET_TEXTURE_CONTROL1 0x00971B10 # define NV097_SET_TEXTURE_CONTROL1 0x00971B10
# define NV097_SET_TEXTURE_CONTROL1_IMAGE_PITCH 0xFFFF0000 # define NV097_SET_TEXTURE_CONTROL1_IMAGE_PITCH 0xFFFF0000
# define NV097_SET_TEXTURE_FILTER 0x00971B14
# define NV097_SET_TEXTURE_FILTER_MIN 0x00FF0000
# define NV097_SET_TEXTURE_FILTER_MAG 0x0F000000
# define NV097_SET_TEXTURE_IMAGE_RECT 0x00971B1C # define NV097_SET_TEXTURE_IMAGE_RECT 0x00971B1C
# define NV097_SET_TEXTURE_IMAGE_RECT_WIDTH 0xFFFF0000 # define NV097_SET_TEXTURE_IMAGE_RECT_WIDTH 0xFFFF0000
# define NV097_SET_TEXTURE_IMAGE_RECT_HEIGHT 0x0000FFFF # define NV097_SET_TEXTURE_IMAGE_RECT_HEIGHT 0x0000FFFF
@ -446,6 +449,24 @@ static const GLenum kelvin_primitive_map[] = {
GL_POLYGON, GL_POLYGON,
}; };
static const GLenum kelvin_texture_min_filter_map[] = {
0,
GL_NEAREST,
GL_LINEAR,
GL_NEAREST_MIPMAP_NEAREST,
GL_LINEAR_MIPMAP_NEAREST,
GL_NEAREST_MIPMAP_LINEAR,
GL_LINEAR_MIPMAP_LINEAR,
0,
};
static const GLenum kelvin_texture_mag_filter_map[] = {
0,
GL_NEAREST,
GL_LINEAR,
0,
};
typedef struct ColorFormatInfo { typedef struct ColorFormatInfo {
unsigned int bytes_per_pixel; unsigned int bytes_per_pixel;
bool swizzled; bool swizzled;
@ -571,6 +592,9 @@ typedef struct Texture {
unsigned int pitch; unsigned int pitch;
unsigned int color_format; unsigned int color_format;
unsigned int min_filter;
unsigned int mag_filter;
bool dma_select; bool dma_select;
hwaddr offset; hwaddr offset;
@ -1121,6 +1145,10 @@ static void kelvin_bind_textures(NV2AState *d, KelvinState *kelvin)
glTexParameteri(gl_target, GL_TEXTURE_MAX_LEVEL, glTexParameteri(gl_target, GL_TEXTURE_MAX_LEVEL,
texture->max_mipmap_level); texture->max_mipmap_level);
glTexParameteri(gl_target, GL_TEXTURE_MIN_FILTER,
kelvin_texture_min_filter_map[texture->min_filter]);
glTexParameteri(gl_target, GL_TEXTURE_MAG_FILTER,
kelvin_texture_min_filter_map[texture->mag_filter]);
/* load texture data*/ /* load texture data*/
@ -1540,6 +1568,15 @@ static void pgraph_method(NV2AState *d,
kelvin->textures[slot].pitch = kelvin->textures[slot].pitch =
GET_MASK(parameter, NV097_SET_TEXTURE_CONTROL1_IMAGE_PITCH); GET_MASK(parameter, NV097_SET_TEXTURE_CONTROL1_IMAGE_PITCH);
break;
CASE_4(NV097_SET_TEXTURE_FILTER, 64):
slot = (class_method - NV097_SET_TEXTURE_FILTER) / 64;
kelvin->textures[slot].min_filter =
GET_MASK(parameter, NV097_SET_TEXTURE_FILTER_MIN);
kelvin->textures[slot].mag_filter =
GET_MASK(parameter, NV097_SET_TEXTURE_FILTER_MAG);
break; break;
CASE_4(NV097_SET_TEXTURE_IMAGE_RECT, 64): CASE_4(NV097_SET_TEXTURE_IMAGE_RECT, 64):
slot = (class_method - NV097_SET_TEXTURE_IMAGE_RECT) / 64; slot = (class_method - NV097_SET_TEXTURE_IMAGE_RECT) / 64;