OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa: Fold long lines introduced by the previous patch.

Browse Source 
Reviewed-by: Chris Forbes <chrisf@ijw.co.nz>
Reviewed-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
Paul Berry
2014-01-09 11:27:38 -08:00
parent 3b22146dc7
commit 1aef45578c
8 changed files with 32 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/mesa/drivers/dri/i965/brw_gs_surface_state.c
View File

@@ -69,7 +69,8 @@ brw_upload_gs_ubo_surfaces(struct brw_context *brw)
struct gl_context *ctx = &brw->ctx; struct gl_context *ctx = &brw->ctx;
/* _NEW_PROGRAM */ /* _NEW_PROGRAM */
struct gl_shader_program *prog = ctx->Shader.CurrentProgram[MESA_SHADER_GEOMETRY]; struct gl_shader_program *prog =
ctx->Shader.CurrentProgram[MESA_SHADER_GEOMETRY];
if (!prog) if (!prog)
return; return;
@@ -93,7 +94,8 @@ brw_upload_gs_abo_surfaces(struct brw_context *brw)
{ {
struct gl_context *ctx = &brw->ctx; struct gl_context *ctx = &brw->ctx;
/* _NEW_PROGRAM */ /* _NEW_PROGRAM */
struct gl_shader_program *prog = ctx->Shader.CurrentProgram[MESA_SHADER_GEOMETRY]; struct gl_shader_program *prog =
ctx->Shader.CurrentProgram[MESA_SHADER_GEOMETRY];
if (prog) { if (prog) {
/* CACHE_NEW_GS_PROG */ /* CACHE_NEW_GS_PROG */

5
src/mesa/drivers/dri/i965/brw_vec4_gs.c
View File

@@ -296,8 +296,9 @@ brw_upload_gs_prog(struct brw_context *brw)
if (!brw_search_cache(&brw->cache, BRW_GS_PROG, if (!brw_search_cache(&brw->cache, BRW_GS_PROG,
&key, sizeof(key), &key, sizeof(key),
&stage_state->prog_offset, &brw->gs.prog_data)) { &stage_state->prog_offset, &brw->gs.prog_data)) {
bool success = do_gs_prog(brw, ctx->Shader.CurrentProgram[MESA_SHADER_GEOMETRY], bool success =
gp, &key); do_gs_prog(brw, ctx->Shader.CurrentProgram[MESA_SHADER_GEOMETRY], gp,
&key);
assert(success); assert(success);
} }
brw->gs.base.prog_data = &brw->gs.prog_data->base.base; brw->gs.base.prog_data = &brw->gs.prog_data->base.base;

5
src/mesa/drivers/dri/i965/brw_vs.c
View File

@@ -482,8 +482,9 @@ static void brw_upload_vs_prog(struct brw_context *brw)
if (!brw_search_cache(&brw->cache, BRW_VS_PROG, if (!brw_search_cache(&brw->cache, BRW_VS_PROG,
&key, sizeof(key), &key, sizeof(key),
&brw->vs.base.prog_offset, &brw->vs.prog_data)) { &brw->vs.base.prog_offset, &brw->vs.prog_data)) {
bool success = do_vs_prog(brw, ctx->Shader.CurrentProgram[MESA_SHADER_VERTEX], bool success =
vp, &key); do_vs_prog(brw, ctx->Shader.CurrentProgram[MESA_SHADER_VERTEX], vp,
&key);
(void) success; (void) success;
assert(success); assert(success);
} }

6
src/mesa/drivers/dri/i965/brw_vs_surface_state.c
View File

@@ -130,7 +130,8 @@ brw_upload_vs_ubo_surfaces(struct brw_context *brw)
{ {
struct gl_context *ctx = &brw->ctx; struct gl_context *ctx = &brw->ctx;
/* _NEW_PROGRAM */ /* _NEW_PROGRAM */
struct gl_shader_program *prog = ctx->Shader.CurrentProgram[MESA_SHADER_VERTEX]; struct gl_shader_program *prog =
ctx->Shader.CurrentProgram[MESA_SHADER_VERTEX];
if (!prog) if (!prog)
return; return;
@@ -154,7 +155,8 @@ brw_upload_vs_abo_surfaces(struct brw_context *brw)
{ {
struct gl_context *ctx = &brw->ctx; struct gl_context *ctx = &brw->ctx;
/* _NEW_PROGRAM */ /* _NEW_PROGRAM */
struct gl_shader_program *prog = ctx->Shader.CurrentProgram[MESA_SHADER_VERTEX]; struct gl_shader_program *prog =
ctx->Shader.CurrentProgram[MESA_SHADER_VERTEX];
if (prog) { if (prog) {
/* CACHE_NEW_VS_PROG */ /* CACHE_NEW_VS_PROG */

6
src/mesa/main/context.c
View File

@@ -1801,7 +1801,8 @@ _mesa_valid_to_render(struct gl_context *ctx, const char *where)
ctx->Shader.CurrentProgram[MESA_SHADER_GEOMETRY], ctx->Shader.CurrentProgram[MESA_SHADER_GEOMETRY],
errMsg)) { errMsg)) {
_mesa_warning(ctx, "Shader program %u is invalid: %s", _mesa_warning(ctx, "Shader program %u is invalid: %s",
ctx->Shader.CurrentProgram[MESA_SHADER_GEOMETRY]->Name, errMsg); ctx->Shader.CurrentProgram[MESA_SHADER_GEOMETRY]->Name,
errMsg);
} }
} }
#endif #endif
@@ -1822,7 +1823,8 @@ _mesa_valid_to_render(struct gl_context *ctx, const char *where)
ctx->Shader.CurrentProgram[MESA_SHADER_FRAGMENT], ctx->Shader.CurrentProgram[MESA_SHADER_FRAGMENT],
errMsg)) { errMsg)) {
_mesa_warning(ctx, "Shader program %u is invalid: %s", _mesa_warning(ctx, "Shader program %u is invalid: %s",
ctx->Shader.CurrentProgram[MESA_SHADER_FRAGMENT]->Name, errMsg); ctx->Shader.CurrentProgram[MESA_SHADER_FRAGMENT]->Name,
errMsg);
} }
} }
#endif #endif

9
src/mesa/main/state.c
View File

@@ -94,9 +94,12 @@ update_program_enables(struct gl_context *ctx)
static GLbitfield static GLbitfield
update_program(struct gl_context *ctx) update_program(struct gl_context *ctx)
{ {
const struct gl_shader_program *vsProg = ctx->Shader.CurrentProgram[MESA_SHADER_VERTEX]; const struct gl_shader_program *vsProg =
const struct gl_shader_program *gsProg = ctx->Shader.CurrentProgram[MESA_SHADER_GEOMETRY]; ctx->Shader.CurrentProgram[MESA_SHADER_VERTEX];
struct gl_shader_program *fsProg = ctx->Shader.CurrentProgram[MESA_SHADER_FRAGMENT]; const struct gl_shader_program *gsProg =
ctx->Shader.CurrentProgram[MESA_SHADER_GEOMETRY];
struct gl_shader_program *fsProg =
ctx->Shader.CurrentProgram[MESA_SHADER_FRAGMENT];
const struct gl_vertex_program *prevVP = ctx->VertexProgram._Current; const struct gl_vertex_program *prevVP = ctx->VertexProgram._Current;
const struct gl_fragment_program *prevFP = ctx->FragmentProgram._Current; const struct gl_fragment_program *prevFP = ctx->FragmentProgram._Current;
const struct gl_geometry_program *prevGP = ctx->GeometryProgram._Current; const struct gl_geometry_program *prevGP = ctx->GeometryProgram._Current;

3
src/mesa/main/transformfeedback.c
View File

@@ -393,7 +393,8 @@ _mesa_BeginTransformFeedback(GLenum mode)
return; return;
} }
info = &ctx->Shader.CurrentProgram[MESA_SHADER_VERTEX]->LinkedTransformFeedback; info =
&ctx->Shader.CurrentProgram[MESA_SHADER_VERTEX]->LinkedTransformFeedback;
if (info->NumOutputs == 0) { if (info->NumOutputs == 0) {
_mesa_error(ctx, GL_INVALID_OPERATION, _mesa_error(ctx, GL_INVALID_OPERATION,

9
src/mesa/state_tracker/st_atom_constbuf.c
View File

@@ -218,7 +218,8 @@ static void st_bind_ubos(struct st_context *st,
static void bind_vs_ubos(struct st_context *st) static void bind_vs_ubos(struct st_context *st)
{ {
struct gl_shader_program *prog = st->ctx->Shader.CurrentProgram[MESA_SHADER_VERTEX]; struct gl_shader_program *prog =
st->ctx->Shader.CurrentProgram[MESA_SHADER_VERTEX];
if (!prog) if (!prog)
return; return;
@@ -237,7 +238,8 @@ const struct st_tracked_state st_bind_vs_ubos = {
static void bind_fs_ubos(struct st_context *st) static void bind_fs_ubos(struct st_context *st)
{ {
struct gl_shader_program *prog = st->ctx->Shader.CurrentProgram[MESA_SHADER_FRAGMENT]; struct gl_shader_program *prog =
st->ctx->Shader.CurrentProgram[MESA_SHADER_FRAGMENT];
if (!prog) if (!prog)
return; return;
@@ -256,7 +258,8 @@ const struct st_tracked_state st_bind_fs_ubos = {
static void bind_gs_ubos(struct st_context *st) static void bind_gs_ubos(struct st_context *st)
{ {
struct gl_shader_program *prog = st->ctx->Shader.CurrentProgram[MESA_SHADER_GEOMETRY]; struct gl_shader_program *prog =
st->ctx->Shader.CurrentProgram[MESA_SHADER_GEOMETRY];
if (!prog) if (!prog)
return; return;