summaryrefslogtreecommitdiff
path: root/src/mesa/tnl/t_vb_points.c
diff options
context:
space:
mode:
authorMichal Krol <mjkrol@gmail.org>2006-02-13 11:23:36 +0000
committerMichal Krol <mjkrol@gmail.org>2006-02-13 11:23:36 +0000
commita2ea606377ed5679dc513eabcf2d398216b47d61 (patch)
treebd50c1ae07d521b8b1aada83973f81faa291f697 /src/mesa/tnl/t_vb_points.c
parent2363fff347a064b9584ecb8e26d80d421cafbbbd (diff)
Add ARB_vertex_shader stage just before render stage.
If enabled, all other stages, except render, are disabled.
Diffstat (limited to 'src/mesa/tnl/t_vb_points.c')
-rw-r--r--src/mesa/tnl/t_vb_points.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/mesa/tnl/t_vb_points.c b/src/mesa/tnl/t_vb_points.c
index 47c37930d5..d7f9ad687e 100644
--- a/src/mesa/tnl/t_vb_points.c
+++ b/src/mesa/tnl/t_vb_points.c
@@ -2,7 +2,7 @@
* Mesa 3-D graphics library
* Version: 6.5
*
- * Copyright (C) 1999-2005 Brian Paul All Rights Reserved.
+ * Copyright (C) 1999-2006 Brian Paul All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@@ -47,6 +47,9 @@ struct point_stage_data {
static GLboolean
run_point_stage(GLcontext *ctx, struct tnl_pipeline_stage *stage)
{
+ if (ctx->ShaderObjects.CurrentProgram != NULL)
+ return GL_TRUE;
+
if (ctx->Point._Attenuated && !ctx->VertexProgram._Enabled) {
struct point_stage_data *store = POINT_STAGE_DATA(stage);
struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;