i965: Move brw_new_shader to brw_link.cpp

That's where brw_link_shader lives and they seem to go together.  Also,
this gets it out of libi965_compiler.

Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
This commit is contained in:
Jason Ekstrand 2016-05-25 17:46:07 -07:00
parent 5136b67915
commit e0ae10c49a
2 changed files with 17 additions and 17 deletions

View file

@ -31,6 +31,7 @@
#include "compiler/glsl/program.h" #include "compiler/glsl/program.h"
#include "program/program.h" #include "program/program.h"
#include "main/shaderapi.h" #include "main/shaderapi.h"
#include "main/shaderobj.h"
#include "main/uniforms.h" #include "main/uniforms.h"
/** /**
@ -183,6 +184,22 @@ process_glsl_ir(gl_shader_stage stage,
} }
} }
extern "C" struct gl_shader *
brw_new_shader(struct gl_context *ctx, GLuint name, GLuint type)
{
struct brw_shader *shader;
shader = rzalloc(NULL, struct brw_shader);
if (shader) {
shader->base.Type = type;
shader->base.Stage = _mesa_shader_enum_to_shader_stage(type);
shader->base.Name = name;
_mesa_init_shader(ctx, &shader->base);
}
return &shader->base;
}
extern "C" GLboolean extern "C" GLboolean
brw_link_shader(struct gl_context *ctx, struct gl_shader_program *shProg) brw_link_shader(struct gl_context *ctx, struct gl_shader_program *shProg)
{ {

View file

@ -27,25 +27,8 @@
#include "brw_fs.h" #include "brw_fs.h"
#include "brw_nir.h" #include "brw_nir.h"
#include "brw_vec4_tes.h" #include "brw_vec4_tes.h"
#include "main/shaderobj.h"
#include "main/uniforms.h" #include "main/uniforms.h"
extern "C" struct gl_shader *
brw_new_shader(struct gl_context *ctx, GLuint name, GLuint type)
{
struct brw_shader *shader;
shader = rzalloc(NULL, struct brw_shader);
if (shader) {
shader->base.Type = type;
shader->base.Stage = _mesa_shader_enum_to_shader_stage(type);
shader->base.Name = name;
_mesa_init_shader(ctx, &shader->base);
}
return &shader->base;
}
extern "C" void extern "C" void
brw_mark_surface_used(struct brw_stage_prog_data *prog_data, brw_mark_surface_used(struct brw_stage_prog_data *prog_data,
unsigned surf_index) unsigned surf_index)