OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'origin/gallium-0.1' into gallium-0.2

Browse Source 
Conflicts:

	src/gallium/auxiliary/util/u_math.c
This commit is contained in:
Brian Paul
2008-11-10 11:19:30 -07:00
parent 399da3a337 eb4dded5be
commit 2b66417402
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gallium/auxiliary/util/p_debug.c
View File

@@ -136,8 +136,10 @@ void _debug_vprintf(const char *format, va_list ap)
#elif defined(PIPE_SUBSYSTEM_WINDOWS_MINIPORT) #elif defined(PIPE_SUBSYSTEM_WINDOWS_MINIPORT)
/* TODO */ /* TODO */
#else /* !PIPE_SUBSYSTEM_WINDOWS */ #else /* !PIPE_SUBSYSTEM_WINDOWS */
#ifdef DEBUG
vfprintf(stderr, format, ap); vfprintf(stderr, format, ap);
#endif #endif
#endif
} }

4
src/gallium/auxiliary/util/u_math.c
View File

@@ -30,7 +30,7 @@
#include "util/u_math.h" #include "util/u_math.h"
/** 2^x, for x in [-1.0, 1.0[ */ /** 2^x, for x in [-1.0, 1.0] */
float pow2_table[POW2_TABLE_SIZE]; float pow2_table[POW2_TABLE_SIZE];
@@ -43,7 +43,7 @@ init_pow2_table(void)
} }
/** log2(x), for x in [1.0, 2.0[ */ /** log2(x), for x in [1.0, 2.0] */
float log2_table[LOG2_TABLE_SIZE]; float log2_table[LOG2_TABLE_SIZE];

2
src/mesa/state_tracker/st_draw.c
View File

@@ -672,7 +672,7 @@ st_draw_vbo(GLcontext *ctx,
pipe_buffer_reference(pipe->screen, &vbuffer[attr].buffer, NULL); pipe_buffer_reference(pipe->screen, &vbuffer[attr].buffer, NULL);
assert(!vbuffer[attr].buffer); assert(!vbuffer[attr].buffer);
} }
pipe->set_vertex_buffers(pipe, vp->num_inputs, vbuffer); pipe->set_vertex_buffers(pipe, num_vbuffers, vbuffer);
} }