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

improve inline buffer handling

This commit is contained in:
espes 2015-07-14 22:42:43 +10:00
parent ebd0e71614
commit 2f436be848
1 changed files with 60 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
hw/xbox/nv2a.c
View File

@ -834,6 +834,8 @@ static void gl_debug_label(GLenum target, GLuint name, const char *fmt, ...)
# define NV097_DRAW_ARRAYS_COUNT 0xFF000000 # define NV097_DRAW_ARRAYS_COUNT 0xFF000000
# define NV097_DRAW_ARRAYS_START_INDEX 0x00FFFFFF # define NV097_DRAW_ARRAYS_START_INDEX 0x00FFFFFF
# define NV097_INLINE_ARRAY 0x00971818 # define NV097_INLINE_ARRAY 0x00971818
# define NV097_SET_VERTEX_DATA2F_M 0x00971880
# define NV097_SET_VERTEX_DATA4F_M 0x00971A00
# define NV097_SET_VERTEX_DATA4UB 0x00971940 # define NV097_SET_VERTEX_DATA4UB 0x00971940
# define NV097_SET_TEXTURE_OFFSET 0x00971B00 # define NV097_SET_TEXTURE_OFFSET 0x00971B00
# define NV097_SET_TEXTURE_FORMAT 0x00971B04 # define NV097_SET_TEXTURE_FORMAT 0x00971B04
@ -1193,7 +1195,7 @@ typedef struct VertexAttribute {
* Need to pass the offset to converted attributes */ * Need to pass the offset to converted attributes */
unsigned int inline_array_offset; unsigned int inline_array_offset;
uint32_t inline_value; float inline_value[4];
unsigned int format; unsigned int format;
unsigned int size; /* size of the data type */ unsigned int size; /* size of the data type */
@ -1293,8 +1295,9 @@ typedef struct TextureBinding {
} TextureBinding; } TextureBinding;
typedef struct InlineVertexBufferEntry { typedef struct InlineVertexBufferEntry {
uint32_t position[4]; float position[4];
uint32_t diffuse; float diffuse[4];
float tex_coord[NV2A_MAX_TEXTURES][4];
} InlineVertexBufferEntry; } InlineVertexBufferEntry;
typedef struct KelvinState { typedef struct KelvinState {
@ -1877,7 +1880,7 @@ static void pgraph_bind_vertex_attributes(NV2AState *d,
} else { } else {
glDisableVertexAttribArray(i); glDisableVertexAttribArray(i);
glVertexAttrib4ubv(i, (GLubyte *)&attribute->inline_value); glVertexAttrib4fv(i, attribute->inline_value);
} }
} }
NV2A_GL_DGROUP_END(); NV2A_GL_DGROUP_END();
@ -4058,10 +4061,19 @@ static void pgraph_method(NV2AState *d,
InlineVertexBufferEntry *entry = InlineVertexBufferEntry *entry =
&pg->inline_buffer[pg->inline_buffer_length]; &pg->inline_buffer[pg->inline_buffer_length];
entry->position[slot] = parameter; entry->position[slot] = *(float*)&parameter;
if (slot == 3) { if (slot == 3) {
entry->diffuse = memcpy(entry->diffuse,
pg->vertex_attributes[NV2A_VERTEX_ATTR_DIFFUSE].inline_value; pg->vertex_attributes[NV2A_VERTEX_ATTR_DIFFUSE].inline_value,
sizeof(float)*4);
for (i=0; i<NV2A_MAX_TEXTURES; i++) {
memcpy(entry->tex_coord[i],
pg->vertex_attributes[NV2A_VERTEX_ATTR_TEXTURE0+i]
.inline_value,
sizeof(float)*4);
}
pg->inline_buffer_length++; pg->inline_buffer_length++;
} }
break; break;
@ -4199,12 +4211,23 @@ static void pgraph_method(NV2AState *d,
glVertexAttribPointer(NV2A_VERTEX_ATTR_DIFFUSE, glVertexAttribPointer(NV2A_VERTEX_ATTR_DIFFUSE,
4, 4,
GL_UNSIGNED_BYTE, GL_FLOAT,
GL_TRUE, GL_FALSE,
sizeof(InlineVertexBufferEntry), sizeof(InlineVertexBufferEntry),
(void*)offsetof(InlineVertexBufferEntry, diffuse)); (void*)offsetof(InlineVertexBufferEntry, diffuse));
glEnableVertexAttribArray(NV2A_VERTEX_ATTR_DIFFUSE); glEnableVertexAttribArray(NV2A_VERTEX_ATTR_DIFFUSE);
for (i=0; i<NV2A_MAX_TEXTURES; i++) {
glVertexAttribPointer(NV2A_VERTEX_ATTR_TEXTURE0+i,
4,
GL_FLOAT,
GL_FALSE,
sizeof(InlineVertexBufferEntry),
(void*)(offsetof(InlineVertexBufferEntry, tex_coord)
+ i*sizeof(float)*4));
glEnableVertexAttribArray(NV2A_VERTEX_ATTR_TEXTURE0+i);
}
glDrawArrays(pg->gl_primitive_mode, glDrawArrays(pg->gl_primitive_mode,
0, pg->inline_buffer_length); 0, pg->inline_buffer_length);
} else if (pg->inline_array_length) { } else if (pg->inline_array_length) {
@ -4442,10 +4465,37 @@ static void pgraph_method(NV2AState *d,
pg->inline_array_length++] = parameter; pg->inline_array_length++] = parameter;
break; break;
case NV097_SET_VERTEX_DATA2F_M ...
NV097_SET_VERTEX_DATA2F_M + 0x7c: {
slot = (class_method - NV097_SET_VERTEX_DATA2F_M) / 8;
unsigned int part =
((class_method - NV097_SET_VERTEX_DATA2F_M) % 8) / 4;
pg->vertex_attributes[slot].inline_value[part] = *(float*)&parameter;
pg->vertex_attributes[slot].inline_value[2] = 0.0;
pg->vertex_attributes[slot].inline_value[3] = 1.0;
break;
}
case NV097_SET_VERTEX_DATA4F_M ...
NV097_SET_VERTEX_DATA4F_M + 0xfc: {
slot = (class_method - NV097_SET_VERTEX_DATA4F_M) / 16;
unsigned int part =
((class_method - NV097_SET_VERTEX_DATA4F_M) % 16) / 4;
pg->vertex_attributes[slot].inline_value[part] = *(float*)&parameter;
break;
}
case NV097_SET_VERTEX_DATA4UB ... case NV097_SET_VERTEX_DATA4UB ...
NV097_SET_VERTEX_DATA4UB + 0x3c: NV097_SET_VERTEX_DATA4UB + 0x3c:
slot = (class_method - NV097_SET_VERTEX_DATA4UB) / 4; slot = (class_method - NV097_SET_VERTEX_DATA4UB) / 4;
pg->vertex_attributes[slot].inline_value = parameter; pg->vertex_attributes[slot].inline_value[0] =
(parameter & 0xFF) / 255.0;
pg->vertex_attributes[slot].inline_value[1] =
((parameter >> 8) & 0xFF) / 255.0;
pg->vertex_attributes[slot].inline_value[2] =
((parameter >> 16) & 0xFF) / 255.0;
pg->vertex_attributes[slot].inline_value[3] =
((parameter >> 24) & 0xFF) / 255.0;
break; break;
case NV097_SET_SEMAPHORE_OFFSET: case NV097_SET_SEMAPHORE_OFFSET: