projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
xvmc: force assertion in XvMC tests
[mesa.git]
/
src
/
gallium
/
state_trackers
/
xa
/
xa_priv.h
diff --git
a/src/gallium/state_trackers/xa/xa_priv.h
b/src/gallium/state_trackers/xa/xa_priv.h
index f71c06c6c1996b82ca4277d4c0d5cbe32a5aacb8..13a0e86f66ded42f443cc3521f7a9044f5dd2d5c 100644
(file)
--- a/
src/gallium/state_trackers/xa/xa_priv.h
+++ b/
src/gallium/state_trackers/xa/xa_priv.h
@@
-123,7
+123,7
@@
struct xa_context {
const struct xa_composite *comp;
};
const struct xa_composite *comp;
};
-static
INLINE
void
+static
inline
void
xa_scissor_reset(struct xa_context *ctx)
{
ctx->scissor.maxx = 0;
xa_scissor_reset(struct xa_context *ctx)
{
ctx->scissor.maxx = 0;
@@
-133,7
+133,7
@@
xa_scissor_reset(struct xa_context *ctx)
ctx->scissor_valid = FALSE;
}
ctx->scissor_valid = FALSE;
}
-static
INLINE
void
+static
inline
void
xa_scissor_update(struct xa_context *ctx, unsigned minx, unsigned miny,
unsigned maxx, unsigned maxy)
{
xa_scissor_update(struct xa_context *ctx, unsigned minx, unsigned miny,
unsigned maxx, unsigned maxy)
{
@@
-189,13
+189,13
@@
struct xa_shaders;
* Inline utilities
*/
* Inline utilities
*/
-static
INLINE
int
+static
inline
int
xa_min(int a, int b)
{
return ((a <= b) ? a : b);
}
xa_min(int a, int b)
{
return ((a <= b) ? a : b);
}
-static
INLINE
void
+static
inline
void
xa_pixel_to_float4(uint32_t pixel, float *color)
{
uint32_t r, g, b, a;
xa_pixel_to_float4(uint32_t pixel, float *color)
{
uint32_t r, g, b, a;
@@
-210,7
+210,7
@@
xa_pixel_to_float4(uint32_t pixel, float *color)
color[3] = ((float)a) / 255.;
}
color[3] = ((float)a) / 255.;
}
-static
INLINE
void
+static
inline
void
xa_pixel_to_float4_a8(uint32_t pixel, float *color)
{
uint32_t a;
xa_pixel_to_float4_a8(uint32_t pixel, float *color)
{
uint32_t a;