Implement basic GL_OES_draw_texture functionality.

src/OpenGL/libGLES_CM/Context.cpp

@@ -2274,6 +2274,56 @@ void Context::drawElements(GLenum mode, GLsizei count, GLenum type, const void *
     }
 }
 
+void Context::drawTexture(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height)
+{
+	es1::Framebuffer *framebuffer = getFramebuffer();
+	es1::Renderbuffer *renderbuffer = framebuffer->getColorbuffer();
+	float targetWidth = renderbuffer->getWidth();
+	float targetHeight = renderbuffer->getHeight();
+	float x0 = 2.0f * x / targetWidth - 1.0f;
+	float y0 = 2.0f * y / targetHeight - 1.0f;
+	float x1 = 2.0f * (x + width) / targetWidth - 1.0f;
+	float y1 = 2.0f * (y + height) / targetHeight - 1.0f;
+	float Zw = sw::clamp(mState.zNear + z * (mState.zFar - mState.zNear), mState.zNear, mState.zFar);
+
+	float vertices[][3] = {{x0, y0, Zw},
+						   {x0, y1, Zw},
+						   {x1, y0, Zw},
+						   {x1, y1, Zw}};
+
+	ASSERT(mState.samplerTexture[TEXTURE_2D][1].name() == 0);   // Multi-texturing unimplemented
+	es1::Texture *texture = getSamplerTexture(0, TEXTURE_2D);
+	float textureWidth = texture->getWidth(GL_TEXTURE_2D, 0);
+	float textureHeight = texture->getHeight(GL_TEXTURE_2D, 0);
+	int Ucr = texture->getCropRectU();
+	int Vcr = texture->getCropRectV();
+	int Wcr = texture->getCropRectW();
+	int Hcr = texture->getCropRectH();
+
+	float texCoords[][2] = {{Ucr / textureWidth, Vcr / textureHeight},
+							{Ucr / textureWidth, (Vcr + Hcr) / textureHeight},
+							{(Ucr + Wcr) / textureWidth, Vcr / textureHeight},
+							{(Ucr + Wcr) / textureWidth, (Vcr + Hcr) / textureHeight}};
+
+	VertexAttribute oldPositionAttribute = mState.vertexAttribute[sw::Position];
+	VertexAttribute oldTexCoord0Attribute = mState.vertexAttribute[sw::TexCoord0];
+
+	glVertexPointer(3, GL_FLOAT, 3 * sizeof(float), vertices);
+	glEnableClientState(GL_VERTEX_ARRAY);
+	glTexCoordPointer(2, GL_FLOAT, 2 * sizeof(float), texCoords);
+	glEnableClientState(GL_TEXTURE_COORD_ARRAY);
+
+	textureStack0.push();
+	textureStack0.identity();   // Disable texture coordinate transformation
+
+	drawArrays(GL_TRIANGLE_STRIP, 0, 4);
+
+	// Restore state
+	mState.vertexAttribute[sw::Position] = oldPositionAttribute;
+	mState.vertexAttribute[sw::TexCoord0] = oldTexCoord0Attribute;
+	textureStack0.pop();
+}
+
 void Context::finish()
 {
 	device->finish();

src/OpenGL/libGLES_CM/Context.h

@@ -419,6 +419,7 @@ public:
     void clear(GLbitfield mask);
     void drawArrays(GLenum mode, GLint first, GLsizei count);
     void drawElements(GLenum mode, GLsizei count, GLenum type, const void *indices);
+    void drawTexture(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height);
     void finish();
     void flush();
 

src/OpenGL/libGLES_CM/Texture.cpp

@@ -35,6 +35,10 @@ Texture::Texture(GLuint name) : egl::Texture(name)
     mWrapS = GL_REPEAT;
     mWrapT = GL_REPEAT;
 	mMaxAnisotropy = 1.0f;
+	cropRectU = 0;
+	cropRectV = 0;
+	cropRectW = 0;
+	cropRectH = 0;
 
 	resource = new sw::Resource(0);
 }
@@ -144,6 +148,14 @@ bool Texture::setMaxAnisotropy(float textureMaxAnisotropy)
     return true;
 }
 
+void Texture::setCropRect(GLint u, GLint v, GLint w, GLint h)
+{
+	cropRectU = u;
+	cropRectV = v;
+	cropRectW = w;
+	cropRectH = h;
+}
+
 GLenum Texture::getMinFilter() const
 {
     return mMinFilter;
@@ -169,6 +181,26 @@ GLfloat Texture::getMaxAnisotropy() const
     return mMaxAnisotropy;
 }
 
+GLint Texture::getCropRectU() const
+{
+	return cropRectU;
+}
+
+GLint Texture::getCropRectV() const
+{
+	return cropRectV;
+}
+
+GLint Texture::getCropRectW() const
+{
+	return cropRectW;
+}
+
+GLint Texture::getCropRectH() const
+{
+	return cropRectH;
+}
+
 egl::Image *Texture::createSharedImage(GLenum target, unsigned int level)
 {
     egl::Image *image = getRenderTarget(target, level);   // Increments reference count

src/OpenGL/libGLES_CM/Texture.h

@@ -65,12 +65,17 @@ public:
     bool setWrapS(GLenum wrap);
     bool setWrapT(GLenum wrap);
 	bool setMaxAnisotropy(GLfloat textureMaxAnisotropy);
+	void setCropRect(GLint u, GLint v, GLint w, GLint h);
 
     GLenum getMinFilter() const;
     GLenum getMagFilter() const;
     GLenum getWrapS() const;
     GLenum getWrapT() const;
 	GLfloat getMaxAnisotropy() const;
+	GLint getCropRectU() const;
+    GLint getCropRectV() const;
+    GLint getCropRectW() const;
+    GLint getCropRectH() const;
 
     virtual GLsizei getWidth(GLenum target, GLint level) const = 0;
     virtual GLsizei getHeight(GLenum target, GLint level) const = 0;
@@ -106,6 +111,10 @@ protected:
     GLenum mWrapS;
     GLenum mWrapT;
 	GLfloat mMaxAnisotropy;
+	GLint cropRectU;
+	GLint cropRectV;
+	GLint cropRectW;
+	GLint cropRectH;
 
 	sw::Resource *resource;
 };

src/OpenGL/libGLES_CM/libGLES_CM.cpp

@@ -3640,9 +3640,6 @@ void GL_APIENTRY glTexParameteri(GLenum target, GLenum pname, GLint param)
 				return error(GL_INVALID_VALUE);
 			}
 			break;
-		case GL_TEXTURE_CROP_RECT_OES:
-			UNIMPLEMENTED();
-			break;
 		default:
 			return error(GL_INVALID_ENUM);
 		}
@@ -3651,7 +3648,40 @@ void GL_APIENTRY glTexParameteri(GLenum target, GLenum pname, GLint param)
 
 void GL_APIENTRY glTexParameteriv(GLenum target, GLenum pname, const GLint* params)
 {
-	glTexParameteri(target, pname, *params);
+	TRACE("(GLenum target = 0x%X, GLenum pname = 0x%X, GLint param = 0x%0.8p)", target, pname, params);
+
+	switch(pname)
+	{
+	case GL_TEXTURE_CROP_RECT_OES:
+		break;
+	default:
+		return glTexParameteri(target, pname, params[0]);
+	}
+
+	es1::Context *context = es1::getContext();
+
+	if(context)
+	{
+		es1::Texture *texture;
+
+		switch(target)
+		{
+		case GL_TEXTURE_2D:
+			texture = context->getTexture2D();
+			break;
+		default:
+			return error(GL_INVALID_ENUM);
+		}
+
+		switch(pname)
+		{
+		case GL_TEXTURE_CROP_RECT_OES:
+			texture->setCropRect(params[0], params[1], params[2], params[3]);
+			break;
+		default:
+			return error(GL_INVALID_ENUM);
+		}
+	}
 }
 
 void GL_APIENTRY glTexParameterx(GLenum target, GLenum pname, GLfixed param)
@@ -3816,7 +3846,19 @@ void GL_APIENTRY glDrawTexsOES(GLshort x, GLshort y, GLshort z, GLshort width, G
 
 void GL_APIENTRY glDrawTexiOES(GLint x, GLint y, GLint z, GLint width, GLint height)
 {
-	UNIMPLEMENTED();
+	TRACE("(GLint x = %d, GLint y = %d, GLint z = %d, GLint width = %d, GLint height = %d)", x, y, z, width, height);
+
+	if(width <= 0 || height <= 0)
+	{
+		return error(GL_INVALID_VALUE);
+	}
+
+	es1::Context *context = es1::getContext();
+
+	if(context)
+	{
+		context->drawTexture(x, y, z, width, height);
+	}
 }
 
 void GL_APIENTRY glDrawTexxOES(GLfixed x, GLfixed y, GLfixed z, GLfixed width, GLfixed height)