fix a bug where copybit would be rejected in landscape mode (e7829b86) · Commits · e / os / platform_frameworks_native

opengl/libagl/copybit.cpp

+30 −15

Original line number	Original line	Diff line number	Diff line
	@@ -163,15 +163,23 @@ static bool copybit(GLint x, GLint y,
	const GLint Wcr = crop_rect[2];		const GLint Wcr = crop_rect[2];
	const GLint Hcr = crop_rect[3];		const GLint Hcr = crop_rect[3];

	int32_t dsdx = (Wcr << 16) / w; // dsdx = ((Wcr/w)/Wt)*Wt		int32_t dsdx = (Wcr << 16); // dsdx = ((Wcr/w)/Wt)*Wt
	int32_t dtdy = ((-Hcr) << 16) / h; // dtdy = -((Hcr/h)/Ht)*Ht		int32_t dtdy = ((-Hcr) << 16); // dtdy = -((Hcr/h)/Ht)*Ht
			if (transform & COPYBIT_TRANSFORM_ROT_90) {
			dsdx /= h;
			dtdy /= w;
			} else {
			dsdx /= w;
			dtdy /= h;
			}
	if (dsdx < c->copybits.minScale \|\| dsdx > c->copybits.maxScale		if (dsdx < c->copybits.minScale \|\| dsdx > c->copybits.maxScale
	\|\| dtdy < c->copybits.minScale \|\| dtdy > c->copybits.maxScale) {		\|\| dtdy < c->copybits.minScale \|\| dtdy > c->copybits.maxScale) {
	// The requested scale is out of the range the hardware		// The requested scale is out of the range the hardware
	// can support.		// can support.
	LOGD_IF(DEBUG_COPYBIT,		LOGD_IF(DEBUG_COPYBIT,
	"scale out of range dsdx=%08x, dtdy=%08x", dsdx, dtdy);		"scale out of range dsdx=%08x (Wcr=%d / w=%d), "
			"dtdy=%08x (Hcr=%d / h=%d), Ucr=%d, Vcr=%d",
			dsdx, Wcr, w, dtdy, Hcr, h, Ucr, Vcr);
	return false;		return false;
	}		}

	@@ -198,22 +206,30 @@ static bool copybit(GLint x, GLint y,
	static const int tmu = 0;		static const int tmu = 0;
	texture_t& tev(c->rasterizer.state.texture[tmu]);		texture_t& tev(c->rasterizer.state.texture[tmu]);
	bool srcTextureHasAlpha = hasAlpha(textureObject->surface.format);		bool srcTextureHasAlpha = hasAlpha(textureObject->surface.format);
	switch (tev.env) {

	case GGL_REPLACE:
	if (!srcTextureHasAlpha) {		if (!srcTextureHasAlpha) {
	planeAlpha = fixedToByte(c->currentColorClamped.a);		planeAlpha = fixedToByte(c->currentColorClamped.a);
	}		}
	break;

			switch (tev.env) {
			case GGL_REPLACE:
			break;
	case GGL_MODULATE:		case GGL_MODULATE:
	if (! (c->currentColorClamped.r == FIXED_ONE		if (! (c->currentColorClamped.r == FIXED_ONE &&
	&& c->currentColorClamped.g == FIXED_ONE		c->currentColorClamped.g == FIXED_ONE &&
	&& c->currentColorClamped.b == FIXED_ONE)) {		c->currentColorClamped.b == FIXED_ONE)) {
	LOGD_IF(DEBUG_COPYBIT, "MODULATE and non white color");		LOGD_IF(DEBUG_COPYBIT,
			"MODULATE and non white color (%08x, %08x, %08x)",
			c->currentColorClamped.r,
			c->currentColorClamped.g,
			c->currentColorClamped.b);
			return false;
			}
			if (srcTextureHasAlpha && c->currentColorClamped.a < FIXED_ONE) {
			LOGD_IF(DEBUG_COPYBIT,
			"MODULATE and texture w/alpha and alpha=%08x)",
			c->currentColorClamped.a);
	return false;		return false;
	}		}
	planeAlpha = fixedToByte(c->currentColorClamped.a);
	break;		break;

	default:		default:
	@@ -223,7 +239,6 @@ static bool copybit(GLint x, GLint y,
	}		}

	bool blending = false;		bool blending = false;

	if ((enables & GGL_ENABLE_BLENDING)		if ((enables & GGL_ENABLE_BLENDING)
	&& !(c->rasterizer.state.blend.src == GL_ONE		&& !(c->rasterizer.state.blend.src == GL_ONE
	&& c->rasterizer.state.blend.dst == GL_ZERO)) {		&& c->rasterizer.state.blend.dst == GL_ZERO)) {