projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'llvm-cliptest-viewport'
[mesa.git]
/
src
/
mesa
/
drivers
/
dri
/
i915
/
i915_state.c
diff --git
a/src/mesa/drivers/dri/i915/i915_state.c
b/src/mesa/drivers/dri/i915/i915_state.c
index 91b228d52b9e62a677970b3e9dc3747bc9b2f6f7..9508fbaf9426e5f3e421981a4f4fc9991cc48c79 100644
(file)
--- a/
src/mesa/drivers/dri/i915/i915_state.c
+++ b/
src/mesa/drivers/dri/i915/i915_state.c
@@
-49,7
+49,7
@@
#define FILE_DEBUG_FLAG DEBUG_STATE
void
#define FILE_DEBUG_FLAG DEBUG_STATE
void
-i915_update_stencil(
GL
context * ctx)
+i915_update_stencil(
struct gl_
context * ctx)
{
struct i915_context *i915 = I915_CONTEXT(ctx);
GLuint front_ref, front_writemask, front_mask;
{
struct i915_context *i915 = I915_CONTEXT(ctx);
GLuint front_ref, front_writemask, front_mask;
@@
-147,24
+147,24
@@
i915_update_stencil(GLcontext * ctx)
}
static void
}
static void
-i915StencilFuncSeparate(
GL
context * ctx, GLenum face, GLenum func, GLint ref,
+i915StencilFuncSeparate(
struct gl_
context * ctx, GLenum face, GLenum func, GLint ref,
GLuint mask)
{
}
static void
GLuint mask)
{
}
static void
-i915StencilMaskSeparate(
GL
context * ctx, GLenum face, GLuint mask)
+i915StencilMaskSeparate(
struct gl_
context * ctx, GLenum face, GLuint mask)
{
}
static void
{
}
static void
-i915StencilOpSeparate(
GL
context * ctx, GLenum face, GLenum fail, GLenum zfail,
+i915StencilOpSeparate(
struct gl_
context * ctx, GLenum face, GLenum fail, GLenum zfail,
GLenum zpass)
{
}
static void
GLenum zpass)
{
}
static void
-i915AlphaFunc(
GL
context * ctx, GLenum func, GLfloat ref)
+i915AlphaFunc(
struct gl_
context * ctx, GLenum func, GLfloat ref)
{
struct i915_context *i915 = I915_CONTEXT(ctx);
int test = intel_translate_compare_func(func);
{
struct i915_context *i915 = I915_CONTEXT(ctx);
int test = intel_translate_compare_func(func);
@@
-187,7
+187,7
@@
i915AlphaFunc(GLcontext * ctx, GLenum func, GLfloat ref)
* calls to glEnable.
*/
static void
* calls to glEnable.
*/
static void
-i915EvalLogicOpBlendState(
GL
context * ctx)
+i915EvalLogicOpBlendState(
struct gl_
context * ctx)
{
struct i915_context *i915 = I915_CONTEXT(ctx);
{
struct i915_context *i915 = I915_CONTEXT(ctx);
@@
-210,7
+210,7
@@
i915EvalLogicOpBlendState(GLcontext * ctx)
}
static void
}
static void
-i915BlendColor(
GL
context * ctx, const GLfloat color[4])
+i915BlendColor(
struct gl_
context * ctx, const GLfloat color[4])
{
struct i915_context *i915 = I915_CONTEXT(ctx);
GLubyte r, g, b, a;
{
struct i915_context *i915 = I915_CONTEXT(ctx);
GLubyte r, g, b, a;
@@
-255,7
+255,7
@@
translate_blend_equation(GLenum mode)
}
static void
}
static void
-i915UpdateBlendState(
GL
context * ctx)
+i915UpdateBlendState(
struct gl_
context * ctx)
{
struct i915_context *i915 = I915_CONTEXT(ctx);
GLuint iab = (i915->state.Ctx[I915_CTXREG_IAB] &
{
struct i915_context *i915 = I915_CONTEXT(ctx);
GLuint iab = (i915->state.Ctx[I915_CTXREG_IAB] &
@@
-306,7
+306,7
@@
i915UpdateBlendState(GLcontext * ctx)
static void
static void
-i915BlendFuncSeparate(
GL
context * ctx, GLenum srcRGB,
+i915BlendFuncSeparate(
struct gl_
context * ctx, GLenum srcRGB,
GLenum dstRGB, GLenum srcA, GLenum dstA)
{
i915UpdateBlendState(ctx);
GLenum dstRGB, GLenum srcA, GLenum dstA)
{
i915UpdateBlendState(ctx);
@@
-314,14
+314,14
@@
i915BlendFuncSeparate(GLcontext * ctx, GLenum srcRGB,
static void
static void
-i915BlendEquationSeparate(
GL
context * ctx, GLenum eqRGB, GLenum eqA)
+i915BlendEquationSeparate(
struct gl_
context * ctx, GLenum eqRGB, GLenum eqA)
{
i915UpdateBlendState(ctx);
}
static void
{
i915UpdateBlendState(ctx);
}
static void
-i915DepthFunc(
GL
context * ctx, GLenum func)
+i915DepthFunc(
struct gl_
context * ctx, GLenum func)
{
struct i915_context *i915 = I915_CONTEXT(ctx);
int test = intel_translate_compare_func(func);
{
struct i915_context *i915 = I915_CONTEXT(ctx);
int test = intel_translate_compare_func(func);
@@
-334,7
+334,7
@@
i915DepthFunc(GLcontext * ctx, GLenum func)
}
static void
}
static void
-i915DepthMask(
GL
context * ctx, GLboolean flag)
+i915DepthMask(
struct gl_
context * ctx, GLboolean flag)
{
struct i915_context *i915 = I915_CONTEXT(ctx);
{
struct i915_context *i915 = I915_CONTEXT(ctx);
@@
-357,7
+357,7
@@
i915DepthMask(GLcontext * ctx, GLboolean flag)
* - window pos/size or FBO size
*/
void
* - window pos/size or FBO size
*/
void
-intelCalcViewport(
GL
context * ctx)
+intelCalcViewport(
struct gl_
context * ctx)
{
struct intel_context *intel = intel_context(ctx);
const GLfloat *v = ctx->Viewport._WindowMap.m;
{
struct intel_context *intel = intel_context(ctx);
const GLfloat *v = ctx->Viewport._WindowMap.m;
@@
-390,18
+390,16
@@
intelCalcViewport(GLcontext * ctx)
/** Called from ctx->Driver.Viewport() */
static void
/** Called from ctx->Driver.Viewport() */
static void
-i915Viewport(
GL
context * ctx,
+i915Viewport(
struct gl_
context * ctx,
GLint x, GLint y, GLsizei width, GLsizei height)
{
intelCalcViewport(ctx);
GLint x, GLint y, GLsizei width, GLsizei height)
{
intelCalcViewport(ctx);
-
- intel_viewport(ctx, x, y, width, height);
}
/** Called from ctx->Driver.DepthRange() */
static void
}
/** Called from ctx->Driver.DepthRange() */
static void
-i915DepthRange(
GL
context * ctx, GLclampd nearval, GLclampd farval)
+i915DepthRange(
struct gl_
context * ctx, GLclampd nearval, GLclampd farval)
{
intelCalcViewport(ctx);
}
{
intelCalcViewport(ctx);
}
@@
-414,7
+412,7
@@
i915DepthRange(GLcontext * ctx, GLclampd nearval, GLclampd farval)
* Fortunately stipple is usually a repeating pattern.
*/
static void
* Fortunately stipple is usually a repeating pattern.
*/
static void
-i915PolygonStipple(
GL
context * ctx, const GLubyte * mask)
+i915PolygonStipple(
struct gl_
context * ctx, const GLubyte * mask)
{
struct i915_context *i915 = I915_CONTEXT(ctx);
const GLubyte *m;
{
struct i915_context *i915 = I915_CONTEXT(ctx);
const GLubyte *m;
@@
-476,7
+474,7
@@
i915PolygonStipple(GLcontext * ctx, const GLubyte * mask)
* Hardware clipping
*/
static void
* Hardware clipping
*/
static void
-i915Scissor(
GL
context * ctx, GLint x, GLint y, GLsizei w, GLsizei h)
+i915Scissor(
struct gl_
context * ctx, GLint x, GLint y, GLsizei w, GLsizei h)
{
struct i915_context *i915 = I915_CONTEXT(ctx);
int x1, y1, x2, y2;
{
struct i915_context *i915 = I915_CONTEXT(ctx);
int x1, y1, x2, y2;
@@
-516,7
+514,7
@@
i915Scissor(GLcontext * ctx, GLint x, GLint y, GLsizei w, GLsizei h)
}
static void
}
static void
-i915LogicOp(
GL
context * ctx, GLenum opcode)
+i915LogicOp(
struct gl_
context * ctx, GLenum opcode)
{
struct i915_context *i915 = I915_CONTEXT(ctx);
int tmp = intel_translate_logic_op(opcode);
{
struct i915_context *i915 = I915_CONTEXT(ctx);
int tmp = intel_translate_logic_op(opcode);
@@
-531,7
+529,7
@@
i915LogicOp(GLcontext * ctx, GLenum opcode)
static void
static void
-i915CullFaceFrontFace(
GL
context * ctx, GLenum unused)
+i915CullFaceFrontFace(
struct gl_
context * ctx, GLenum unused)
{
struct i915_context *i915 = I915_CONTEXT(ctx);
GLuint mode;
{
struct i915_context *i915 = I915_CONTEXT(ctx);
GLuint mode;
@@
-562,7
+560,7
@@
i915CullFaceFrontFace(GLcontext * ctx, GLenum unused)
}
static void
}
static void
-i915LineWidth(
GL
context * ctx, GLfloat widthf)
+i915LineWidth(
struct gl_
context * ctx, GLfloat widthf)
{
struct i915_context *i915 = I915_CONTEXT(ctx);
int lis4 = i915->state.Ctx[I915_CTXREG_LIS4] & ~S4_LINE_WIDTH_MASK;
{
struct i915_context *i915 = I915_CONTEXT(ctx);
int lis4 = i915->state.Ctx[I915_CTXREG_LIS4] & ~S4_LINE_WIDTH_MASK;
@@
-581,7
+579,7
@@
i915LineWidth(GLcontext * ctx, GLfloat widthf)
}
static void
}
static void
-i915PointSize(
GL
context * ctx, GLfloat size)
+i915PointSize(
struct gl_
context * ctx, GLfloat size)
{
struct i915_context *i915 = I915_CONTEXT(ctx);
int lis4 = i915->state.Ctx[I915_CTXREG_LIS4] & ~S4_POINT_WIDTH_MASK;
{
struct i915_context *i915 = I915_CONTEXT(ctx);
int lis4 = i915->state.Ctx[I915_CTXREG_LIS4] & ~S4_POINT_WIDTH_MASK;
@@
-600,7
+598,7
@@
i915PointSize(GLcontext * ctx, GLfloat size)
static void
static void
-i915PointParameterfv(
GL
context * ctx, GLenum pname, const GLfloat *params)
+i915PointParameterfv(
struct gl_
context * ctx, GLenum pname, const GLfloat *params)
{
struct i915_context *i915 = I915_CONTEXT(ctx);
{
struct i915_context *i915 = I915_CONTEXT(ctx);
@@
-622,7
+620,7
@@
i915PointParameterfv(GLcontext * ctx, GLenum pname, const GLfloat *params)
*/
static void
*/
static void
-i915ColorMask(
GL
context * ctx,
+i915ColorMask(
struct gl_
context * ctx,
GLboolean r, GLboolean g, GLboolean b, GLboolean a)
{
struct i915_context *i915 = I915_CONTEXT(ctx);
GLboolean r, GLboolean g, GLboolean b, GLboolean a)
{
struct i915_context *i915 = I915_CONTEXT(ctx);
@@
-647,7
+645,7
@@
i915ColorMask(GLcontext * ctx,
}
static void
}
static void
-update_specular(
GL
context * ctx)
+update_specular(
struct gl_
context * ctx)
{
/* A hack to trigger the rebuild of the fragment program.
*/
{
/* A hack to trigger the rebuild of the fragment program.
*/
@@
-655,7
+653,7
@@
update_specular(GLcontext * ctx)
}
static void
}
static void
-i915LightModelfv(
GL
context * ctx, GLenum pname, const GLfloat * param)
+i915LightModelfv(
struct gl_
context * ctx, GLenum pname, const GLfloat * param)
{
DBG("%s\n", __FUNCTION__);
{
DBG("%s\n", __FUNCTION__);
@@
-665,7
+663,7
@@
i915LightModelfv(GLcontext * ctx, GLenum pname, const GLfloat * param)
}
static void
}
static void
-i915ShadeModel(
GL
context * ctx, GLenum mode)
+i915ShadeModel(
struct gl_
context * ctx, GLenum mode)
{
struct i915_context *i915 = I915_CONTEXT(ctx);
I915_STATECHANGE(i915, I915_UPLOAD_CTX);
{
struct i915_context *i915 = I915_CONTEXT(ctx);
I915_STATECHANGE(i915, I915_UPLOAD_CTX);
@@
-686,7
+684,7
@@
i915ShadeModel(GLcontext * ctx, GLenum mode)
* Fog
*/
void
* Fog
*/
void
-i915_update_fog(
GL
context * ctx)
+i915_update_fog(
struct gl_
context * ctx)
{
struct i915_context *i915 = I915_CONTEXT(ctx);
GLenum mode;
{
struct i915_context *i915 = I915_CONTEXT(ctx);
GLenum mode;
@@
-782,7
+780,7
@@
i915_update_fog(GLcontext * ctx)
}
static void
}
static void
-i915Fogfv(
GL
context * ctx, GLenum pname, const GLfloat * param)
+i915Fogfv(
struct gl_
context * ctx, GLenum pname, const GLfloat * param)
{
struct i915_context *i915 = I915_CONTEXT(ctx);
{
struct i915_context *i915 = I915_CONTEXT(ctx);
@@
-822,7
+820,7
@@
i915Fogfv(GLcontext * ctx, GLenum pname, const GLfloat * param)
}
static void
}
static void
-i915Hint(
GL
context * ctx, GLenum target, GLenum state)
+i915Hint(
struct gl_
context * ctx, GLenum target, GLenum state)
{
switch (target) {
case GL_FOG_HINT:
{
switch (target) {
case GL_FOG_HINT:
@@
-836,7
+834,7
@@
i915Hint(GLcontext * ctx, GLenum target, GLenum state)
*/
static void
*/
static void
-i915Enable(
GL
context * ctx, GLenum cap, GLboolean state)
+i915Enable(
struct gl_
context * ctx, GLenum cap, GLboolean state)
{
struct i915_context *i915 = I915_CONTEXT(ctx);
{
struct i915_context *i915 = I915_CONTEXT(ctx);
@@
-1095,7
+1093,7
@@
i915_init_packets(struct i915_context *i915)
}
void
}
void
-i915_update_provoking_vertex(
GL
context * ctx)
+i915_update_provoking_vertex(
struct gl_
context * ctx)
{
struct i915_context *i915 = I915_CONTEXT(ctx);
{
struct i915_context *i915 = I915_CONTEXT(ctx);
@@
-1152,7
+1150,7
@@
i915InitStateFunctions(struct dd_function_table *functions)
void
i915InitState(struct i915_context *i915)
{
void
i915InitState(struct i915_context *i915)
{
-
GL
context *ctx = &i915->intel.ctx;
+
struct gl_
context *ctx = &i915->intel.ctx;
i915_init_packets(i915);
i915_init_packets(i915);