st/mesa: whitespace fixes, 80-column wrapping
This commit is contained in:
@@ -182,8 +182,10 @@ st_get_texture_sampler_view_from_stobj(struct st_texture_object *stObj,
|
||||
return stObj->sampler_view;
|
||||
}
|
||||
|
||||
|
||||
static GLboolean
|
||||
update_single_texture(struct st_context *st, struct pipe_sampler_view **sampler_view,
|
||||
update_single_texture(struct st_context *st,
|
||||
struct pipe_sampler_view **sampler_view,
|
||||
GLuint texUnit)
|
||||
{
|
||||
struct pipe_context *pipe = st->pipe;
|
||||
@@ -233,7 +235,6 @@ update_single_texture(struct st_context *st, struct pipe_sampler_view **sampler_
|
||||
st_view_format = firstImageFormat;
|
||||
}
|
||||
|
||||
|
||||
/* if sampler view has changed dereference it */
|
||||
if (stObj->sampler_view) {
|
||||
if (check_sampler_swizzle(stObj->sampler_view,
|
||||
@@ -251,6 +252,7 @@ update_single_texture(struct st_context *st, struct pipe_sampler_view **sampler_
|
||||
return GL_TRUE;
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
update_vertex_textures(struct st_context *st)
|
||||
{
|
||||
@@ -275,7 +277,8 @@ update_vertex_textures(struct st_context *st)
|
||||
|
||||
st->state.num_vertex_textures = su + 1;
|
||||
}
|
||||
pipe_sampler_view_reference(&st->state.sampler_vertex_views[su], sampler_view);
|
||||
pipe_sampler_view_reference(&st->state.sampler_vertex_views[su],
|
||||
sampler_view);
|
||||
}
|
||||
|
||||
if (ctx->Const.MaxVertexTextureImageUnits > 0) {
|
||||
@@ -287,6 +290,7 @@ update_vertex_textures(struct st_context *st)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
update_fragment_textures(struct st_context *st)
|
||||
{
|
||||
@@ -319,6 +323,7 @@ update_fragment_textures(struct st_context *st)
|
||||
st->state.sampler_views);
|
||||
}
|
||||
|
||||
|
||||
const struct st_tracked_state st_update_texture = {
|
||||
"st_update_texture", /* name */
|
||||
{ /* dirty */
|
||||
@@ -328,8 +333,9 @@ const struct st_tracked_state st_update_texture = {
|
||||
update_fragment_textures /* update */
|
||||
};
|
||||
|
||||
|
||||
const struct st_tracked_state st_update_vertex_texture = {
|
||||
"st_update_vertex_texture", /* name */
|
||||
"st_update_vertex_texture", /* name */
|
||||
{ /* dirty */
|
||||
_NEW_TEXTURE, /* mesa */
|
||||
ST_NEW_VERTEX_PROGRAM, /* st */
|
||||
@@ -337,6 +343,8 @@ const struct st_tracked_state st_update_vertex_texture = {
|
||||
update_vertex_textures /* update */
|
||||
};
|
||||
|
||||
|
||||
|
||||
static void
|
||||
finalize_textures(struct st_context *st)
|
||||
{
|
||||
@@ -371,7 +379,6 @@ finalize_textures(struct st_context *st)
|
||||
}
|
||||
|
||||
|
||||
|
||||
const struct st_tracked_state st_finalize_textures = {
|
||||
"st_finalize_textures", /* name */
|
||||
{ /* dirty */
|
||||
|
Reference in New Issue
Block a user