fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-07 08:40:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

r300-gallium: Take care of various bad dereferences in shader setup.

Browse source 
Unbreaks glxinfo.
This commit is contained in:
Corbin Simpson 2009-02-12 23:36:21 -08:00
parent fe7863f3f8
commit 8a2d0005af
3 changed files with 25 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/gallium/drivers/r300/r300_state.c
View file

@ -424,7 +424,10 @@ static void r300_bind_fs_state(struct pipe_context* pipe, void* shader)
struct r300_context* r300 = r300_context(pipe);
struct r3xx_fragment_shader* fs = (struct r3xx_fragment_shader*)shader;
if (!fs->translated) {
if (fs == NULL) {
r300->fs = NULL;
return;
} else if (!fs->translated) {
if (r300_screen(r300->context.screen)->caps->is_r500) {
r500_translate_shader(r300, fs);
} else {
@ -432,11 +435,7 @@ static void r300_bind_fs_state(struct pipe_context* pipe, void* shader)
}
}
if (!fs->translated) {
debug_printf("r300: Couldn't assemble fragment shader...\n");
/* XXX exit here */
}
fs->translated = true;
r300->fs = fs;
r300->dirty_state |= R300_NEW_FRAGMENT_SHADER;

24
src/gallium/drivers/r300/r300_state_shader.c
View file

@ -22,16 +22,32 @@
#include "r300_state_shader.h"
static void r300_copy_passthrough_shader(struct r300_fragment_shader* fs)
{
struct r300_fragment_shader* pt = &r300_passthrough_fragment_shader;
fs->shader.stack_size = pt->shader.stack_size;
fs->alu_instruction_count = pt->alu_instruction_count;
fs->tex_instruction_count = pt->tex_instruction_count;
fs->indirections = pt->indirections;
fs->instructions[0] = pt->instructions[0];
}
static void r500_copy_passthrough_shader(struct r500_fragment_shader* fs)
{
struct r500_fragment_shader* pt = &r500_passthrough_fragment_shader;
fs->shader.stack_size = pt->shader.stack_size;
fs->instruction_count = pt->instruction_count;
fs->instructions[0] = pt->instructions[0];
}
void r300_translate_shader(struct r300_context* r300,
struct r300_fragment_shader* fs)
{
/* XXX fix this at some point */
*fs = r300_passthrough_fragment_shader;
r300_copy_passthrough_shader(fs);
}
void r500_translate_shader(struct r300_context* r300,
struct r500_fragment_shader* fs)
{
/* XXX fix this at some point */
*fs = r500_passthrough_fragment_shader;
r500_copy_passthrough_shader(fs);
}

1
src/gallium/drivers/r300/r300_state_shader.h
View file

@ -83,7 +83,6 @@ static const struct r500_fragment_shader r500_passthrough_fragment_shader = {
R500_ALU_RGBA_OP_CMP | R500_ALU_RGBA_R_SWIZ_0 |
R500_ALU_RGBA_G_SWIZ_0 | R500_ALU_RGBA_B_SWIZ_0 |
R500_ALU_RGBA_A_SWIZ_0,
.shader.translated = TRUE,
};
#endif /* R300_STATE_SHADER_H */