[mutter] cogl: Remove fixed-function workaround for point sprite coordinates
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] cogl: Remove fixed-function workaround for point sprite coordinates
- Date: Thu, 16 Jan 2020 18:54:49 +0000 (UTC)
commit 71a2ba7a9868ce2e3de4671847439e05b7051b82
Author: Adam Jackson <ajax redhat com>
Date: Thu Dec 19 16:10:23 2019 -0500
cogl: Remove fixed-function workaround for point sprite coordinates
https://gitlab.gnome.org/GNOME/mutter/merge_requests/995
cogl/cogl/driver/gl/cogl-pipeline-opengl.c | 21 ---------------------
1 file changed, 21 deletions(-)
---
diff --git a/cogl/cogl/driver/gl/cogl-pipeline-opengl.c b/cogl/cogl/driver/gl/cogl-pipeline-opengl.c
index 4b16e22a1..b73e6b205 100644
--- a/cogl/cogl/driver/gl/cogl-pipeline-opengl.c
+++ b/cogl/cogl/driver/gl/cogl-pipeline-opengl.c
@@ -687,27 +687,6 @@ flush_layers_common_gl_state_cb (CoglPipelineLayer *layer, void *user_data)
GE( ctx, glBindSampler (unit_index, sampler_state->sampler_object) );
}
- /* FIXME: If using GLSL the progend we will use gl_PointCoord
- * instead of us needing to replace the texture coordinates but at
- * this point we can't currently tell if we are using the fixed or
- * glsl progend.
- */
-#ifdef HAVE_COGL_GL
- if (ctx->driver == COGL_DRIVER_GL &&
- (layers_difference & COGL_PIPELINE_LAYER_STATE_POINT_SPRITE_COORDS))
- {
- CoglPipelineState change = COGL_PIPELINE_LAYER_STATE_POINT_SPRITE_COORDS;
- CoglPipelineLayer *authority =
- _cogl_pipeline_layer_get_authority (layer, change);
- CoglPipelineLayerBigState *big_state = authority->big_state;
-
- _cogl_set_active_texture_unit (unit_index);
-
- GE (ctx, glTexEnvi (GL_POINT_SPRITE, GL_COORD_REPLACE,
- big_state->point_sprite_coords));
- }
-#endif
-
cogl_object_ref (layer);
if (unit->layer != NULL)
cogl_object_unref (unit->layer);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]