projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
meta: Don't ask for floating point textures if not ARB_texture_float.
[mesa.git]
/
src
/
mesa
/
tnl
/
t_vb_points.c
diff --git
a/src/mesa/tnl/t_vb_points.c
b/src/mesa/tnl/t_vb_points.c
index 01d055c1dd8803682aa121f55da46955fd05f9e3..9edbbc708e60c1b2f7237d69e91dadc4cf8e4217 100644
(file)
--- a/
src/mesa/tnl/t_vb_points.c
+++ b/
src/mesa/tnl/t_vb_points.c
@@
-25,7
+25,9
@@
* Brian Paul
*/
* Brian Paul
*/
+#include "main/glheader.h"
#include "main/mtypes.h"
#include "main/mtypes.h"
+#include "main/dd.h"
#include "main/imports.h"
#include "t_context.h"
#include "t_pipeline.h"
#include "main/imports.h"
#include "t_context.h"
#include "t_pipeline.h"
@@
-45,7
+47,7
@@
struct point_stage_data {
* disabled.
*/
static GLboolean
* disabled.
*/
static GLboolean
-run_point_stage(
GL
context *ctx, struct tnl_pipeline_stage *stage)
+run_point_stage(
struct gl_
context *ctx, struct tnl_pipeline_stage *stage)
{
if (ctx->Point._Attenuated && !ctx->VertexProgram._Current) {
struct point_stage_data *store = POINT_STAGE_DATA(stage);
{
if (ctx->Point._Attenuated && !ctx->VertexProgram._Current) {
struct point_stage_data *store = POINT_STAGE_DATA(stage);
@@
-62,7
+64,7
@@
run_point_stage(GLcontext *ctx, struct tnl_pipeline_stage *stage)
for (i = 0; i < VB->Count; i++) {
const GLfloat dist = FABSF(*eyeCoord);
const GLfloat q = p0 + dist * (p1 + dist * p2);
for (i = 0; i < VB->Count; i++) {
const GLfloat dist = FABSF(*eyeCoord);
const GLfloat q = p0 + dist * (p1 + dist * p2);
- const GLfloat atten = (q != 0.0
) ? SQRTF(1.0 / q) : 1.0
;
+ const GLfloat atten = (q != 0.0
F) ? SQRTF(1.0F / q) : 1.0F
;
size[i][0] = pointSize * atten; /* clamping done in rasterization */
eyeCoord += eyeCoordStride;
}
size[i][0] = pointSize * atten; /* clamping done in rasterization */
eyeCoord += eyeCoordStride;
}
@@
-75,11
+77,11
@@
run_point_stage(GLcontext *ctx, struct tnl_pipeline_stage *stage)
static GLboolean
static GLboolean
-alloc_point_data(
GL
context *ctx, struct tnl_pipeline_stage *stage)
+alloc_point_data(
struct gl_
context *ctx, struct tnl_pipeline_stage *stage)
{
struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
struct point_stage_data *store;
{
struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
struct point_stage_data *store;
- stage->privatePtr =
_mesa_
malloc(sizeof(*store));
+ stage->privatePtr = malloc(sizeof(*store));
store = POINT_STAGE_DATA(stage);
if (!store)
return GL_FALSE;
store = POINT_STAGE_DATA(stage);
if (!store)
return GL_FALSE;
@@
-95,7
+97,7
@@
free_point_data(struct tnl_pipeline_stage *stage)
struct point_stage_data *store = POINT_STAGE_DATA(stage);
if (store) {
_mesa_vector4f_free( &store->PointSize );
struct point_stage_data *store = POINT_STAGE_DATA(stage);
if (store) {
_mesa_vector4f_free( &store->PointSize );
-
_mesa_
free( store );
+ free( store );
stage->privatePtr = NULL;
}
}
stage->privatePtr = NULL;
}
}