On Mon, Sep 28, 2015 at 2:56 AM, Kenneth Graunke <kenn...@whitecape.org> wrote:
> On Monday, September 28, 2015 12:20:30 AM Marek Olšák wrote:
>> From: Marek Olšák <marek.ol...@amd.com>
>>
>> ---
>> src/mesa/drivers/dri/i965/brw_program.c | 1 -
>> src/mesa/drivers/dri/i965/brw_shader.cpp | 16 ----------------
>> src/mesa/drivers/dri/i965/brw_wm.h | 1 -
>> 3 files changed, 18 deletions(-)
>>
>> diff --git a/src/mesa/drivers/dri/i965/brw_program.c
>> b/src/mesa/drivers/dri/i965/brw_program.c
>> index 1ac0ed2..a43d473 100644
>> --- a/src/mesa/drivers/dri/i965/brw_program.c
>> +++ b/src/mesa/drivers/dri/i965/brw_program.c
>> @@ -282,7 +282,6 @@ void brwInitFragProgFuncs( struct dd_function_table
>> *functions )
>> functions->DeleteProgram = brwDeleteProgram;
>> functions->ProgramStringNotify = brwProgramStringNotify;
>>
>> - functions->NewShader = brw_new_shader;
>> functions->LinkShader = brw_link_shader;
>>
>> functions->MemoryBarrier = brw_memory_barrier;
>> diff --git a/src/mesa/drivers/dri/i965/brw_shader.cpp
>> b/src/mesa/drivers/dri/i965/brw_shader.cpp
>> index 785cb27..3ff4fad 100644
>> --- a/src/mesa/drivers/dri/i965/brw_shader.cpp
>> +++ b/src/mesa/drivers/dri/i965/brw_shader.cpp
>> @@ -147,22 +147,6 @@ brw_compiler_create(void *mem_ctx, const struct
>> brw_device_info *devinfo)
>> return compiler;
>> }
>>
>> -struct gl_shader *
>> -brw_new_shader(struct gl_context *ctx, GLuint name, GLuint type)
>> -{
>> - struct brw_shader *shader;
>> -
>> - shader = rzalloc(NULL, struct brw_shader);
>
> This isn't the same as the core Mesa version - it allocates a
> brw_shader, which actually has an additional field over gl_shader.
Ok. Consider the first 2 patches dropped.
Marek
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
