mainnika
/
weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

compositor: move texture_damage into renderer private

Browse Source 
Only the gl_renderer uses this field.

Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
dev
Pekka Paalanen 12 years ago committed by Kristian Høgsberg
parent 68033ac353
commit 81ee3f50c3
3 changed files with 9 additions and 10 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 3
      src/compositor.c
  2. 1
      src/compositor.h
  3. 15
      src/gl-renderer.c

3
src/compositor.c
Unescape View File

@ -228,8 +228,6 @@ weston_surface_create(struct weston_compositor *compositor)
return NULL; return NULL;
} }
pixman_region32_init(&surface->texture_damage);
surface->buffer_transform = WL_OUTPUT_TRANSFORM_NORMAL; surface->buffer_transform = WL_OUTPUT_TRANSFORM_NORMAL;
surface->pending.buffer_transform = surface->buffer_transform; surface->pending.buffer_transform = surface->buffer_transform;
surface->output = NULL; surface->output = NULL;
@ -864,7 +862,6 @@ destroy_surface(struct wl_resource *resource)
weston_buffer_reference(&surface->buffer_ref, NULL); weston_buffer_reference(&surface->buffer_ref, NULL);
pixman_region32_fini(&surface->texture_damage);
compositor->renderer->destroy_surface(surface); compositor->renderer->destroy_surface(surface);
pixman_region32_fini(&surface->transform.boundingbox); pixman_region32_fini(&surface->transform.boundingbox);

1
src/compositor.h
Unescape View File

@ -383,7 +383,6 @@ struct weston_region {
struct weston_surface { struct weston_surface {
struct wl_surface surface; struct wl_surface surface;
struct weston_compositor *compositor; struct weston_compositor *compositor;
pixman_region32_t texture_damage;
pixman_region32_t clip; pixman_region32_t clip;
pixman_region32_t damage; pixman_region32_t damage;
pixman_region32_t opaque; pixman_region32_t opaque;

15
src/gl-renderer.c
Unescape View File

@ -58,6 +58,7 @@ struct gl_surface_state {
GLuint textures[3]; GLuint textures[3];
int num_textures; int num_textures;
pixman_region32_t texture_damage;
EGLImageKHR images[3]; EGLImageKHR images[3];
GLenum target; GLenum target;
@ -1050,8 +1051,8 @@ gl_renderer_flush_damage(struct weston_surface *surface)
int i, n; int i, n;
#endif #endif
pixman_region32_union(&surface->texture_damage, pixman_region32_union(&gs->texture_damage,
&surface->texture_damage, &surface->damage); &gs->texture_damage, &surface->damage);
if (!buffer) if (!buffer)
return; return;
@ -1064,7 +1065,7 @@ gl_renderer_flush_damage(struct weston_surface *surface)
if (surface->plane != &surface->compositor->primary_plane) if (surface->plane != &surface->compositor->primary_plane)
return; return;
if (!pixman_region32_not_empty(&surface->texture_damage)) if (!pixman_region32_not_empty(&gs->texture_damage))
goto done; goto done;
glBindTexture(GL_TEXTURE_2D, gs->textures[0]); glBindTexture(GL_TEXTURE_2D, gs->textures[0]);
@ -1082,7 +1083,7 @@ gl_renderer_flush_damage(struct weston_surface *surface)
/* Mesa does not define GL_EXT_unpack_subimage */ /* Mesa does not define GL_EXT_unpack_subimage */
glPixelStorei(GL_UNPACK_ROW_LENGTH, gs->pitch); glPixelStorei(GL_UNPACK_ROW_LENGTH, gs->pitch);
data = wl_shm_buffer_get_data(buffer); data = wl_shm_buffer_get_data(buffer);
rectangles = pixman_region32_rectangles(&surface->texture_damage, &n); rectangles = pixman_region32_rectangles(&gs->texture_damage, &n);
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
pixman_box32_t r; pixman_box32_t r;
@ -1097,8 +1098,8 @@ gl_renderer_flush_damage(struct weston_surface *surface)
#endif #endif
done: done:
pixman_region32_fini(&surface->texture_damage); pixman_region32_fini(&gs->texture_damage);
pixman_region32_init(&surface->texture_damage); pixman_region32_init(&gs->texture_damage);
weston_buffer_reference(&gs->buffer_ref, NULL); weston_buffer_reference(&gs->buffer_ref, NULL);
} }
@ -1248,6 +1249,7 @@ gl_renderer_create_surface(struct weston_surface *surface)
*/ */
gs->pitch = 1; gs->pitch = 1;
pixman_region32_init(&gs->texture_damage);
surface->renderer_state = gs; surface->renderer_state = gs;
return 0; return 0;
@ -1266,6 +1268,7 @@ gl_renderer_destroy_surface(struct weston_surface *surface)
gr->destroy_image(gr->egl_display, gs->images[i]); gr->destroy_image(gr->egl_display, gs->images[i]);
weston_buffer_reference(&gs->buffer_ref, NULL); weston_buffer_reference(&gs->buffer_ref, NULL);
pixman_region32_fini(&gs->texture_damage);
free(gs); free(gs);
} }

Write Preview
Loading…
Cancel
Save